Adapted for 5.4 from:

From 98b9dfaec95e6f910f125ed172cdbd25abd006ec Mon Sep 17 00:00:00 2001

From: Stanislav Malyshev <stas@php.net>

Date: Sun, 10 Jul 2016 16:17:54 -0700

Subject: [PATCH] Fix for HTTP_PROXY issue.

The following changes are made:

- _SERVER/_ENV only has HTTP_PROXY if the local environment has it,

  and only one from the environment.

- getenv('HTTP_PROXY') only returns one from the local environment

- getenv has optional second parameter, telling it to only consider

  local environment

---

 UPGRADING                      |  3 +++

 ext/standard/basic_functions.c | 17 +++++++------

 main/SAPI.c                    | 48 +++++++++++++++++++-----------------

 main/php_variables.c           | 56 ++++++++++++++++++++++++++++--------------

 4 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c

index 50b6bc7..8cbba14 100644

--- a/ext/standard/basic_functions.c

+++ b/ext/standard/basic_functions.c

@@ -3953,21 +3953,24 @@ PHP_FUNCTION(long2ip)

  * System Functions *

  ********************/

-/* {{{ proto string getenv(string varname)

+/* {{{ proto string getenv(string varname[, bool local_only])

    Get the value of an environment variable */

 PHP_FUNCTION(getenv)

 {

 	char *ptr, *str;

 	int str_len;

+	zend_bool local_only = 0;

-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) {

+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &str, &str_len, &local_only) == FAILURE) {

 		RETURN_FALSE;

 	}

-	/* SAPI method returns an emalloc()'d string */

-	ptr = sapi_getenv(str, str_len TSRMLS_CC);

-	if (ptr) {

-		RETURN_STRING(ptr, 0);

+	if (!local_only) {

+		/* SAPI method returns an emalloc()'d string */

+		ptr = sapi_getenv(str, str_len TSRMLS_CC);

+		if (ptr) {

+			RETURN_STRING(ptr, 0);

+		}

 	}

 #ifdef PHP_WIN32

 	{

diff --git a/main/SAPI.c b/main/SAPI.c

index 0dd0b55..8a56c6d 100644

--- a/main/SAPI.c

+++ b/main/SAPI.c

@@ -1016,7 +1016,11 @@ SAPI_API struct stat *sapi_get_stat(TSRMLS_D)

 SAPI_API char *sapi_getenv(char *name, size_t name_len TSRMLS_DC)

 {

-	if (sapi_module.getenv) { 

+	if (!strncasecmp(name, "HTTP_PROXY", name_len)) {

+		/* Ugly fix for HTTP_PROXY issue */

+		return NULL;

+	}

+	if (sapi_module.getenv) {

 		char *value, *tmp = sapi_module.getenv(name, name_len TSRMLS_CC);

 		if (tmp) {

 			value = estrdup(tmp);

diff --git a/main/php_variables.c b/main/php_variables.c

index bf6b9f3..bbe57d3 100644

--- a/main/php_variables.c

+++ b/main/php_variables.c

@@ -735,10 +735,26 @@ static zend_bool php_auto_globals_create_files(const char *name, uint name_len T

 	zend_hash_update(&EG(symbol_table), name, name_len + 1, &vars, sizeof(zval *), NULL);

 	Z_ADDREF_P(vars);

-	

+

 	return 0; /* don't rearm */

 }

+/* Upgly hack to fix HTTP_PROXY issue */

+static void check_http_proxy(HashTable *var_table) {

+	if (zend_hash_exists(var_table, "HTTP_PROXY", sizeof("HTTP_PROXY"))) {

+		char *local_proxy = getenv("HTTP_PROXY");

+

+		if (!local_proxy) {

+			zend_hash_del(var_table, "HTTP_PROXY", sizeof("HTTP_PROXY"));

+		} else {

+			zval *local_zval;

+			ALLOC_INIT_ZVAL(local_zval);

+			ZVAL_STRING(local_zval, local_proxy, 1);

+			zend_hash_update(var_table, "HTTP_PROXY", sizeof("HTTP_PROXY"), &local_zval, sizeof(zval **), NULL);

+		}

+	}

+}

+

 static zend_bool php_auto_globals_create_server(const char *name, uint name_len TSRMLS_DC)

 {

 	if (PG(variables_order) && (strchr(PG(variables_order),'S') || strchr(PG(variables_order),'s'))) {

@@ -771,9 +787,10 @@ static zend_bool php_auto_globals_create_server(const char *name, uint name_len

 		PG(http_globals)[TRACK_VARS_SERVER] = server_vars;

 	}

+	check_http_proxy(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]));

 	zend_hash_update(&EG(symbol_table), name, name_len + 1, &PG(http_globals)[TRACK_VARS_SERVER], sizeof(zval *), NULL);

 	Z_ADDREF_P(PG(http_globals)[TRACK_VARS_SERVER]);

-	

+

 	return 0; /* don't rearm */

 }

@@ -787,11 +807,12 @@ static zend_bool php_auto_globals_create_env(const char *name, uint name_len TSR

 		zval_ptr_dtor(&PG(http_globals)[TRACK_VARS_ENV]);

 	}

 	PG(http_globals)[TRACK_VARS_ENV] = env_vars;

-	

+

 	if (PG(variables_order) && (strchr(PG(variables_order),'E') || strchr(PG(variables_order),'e'))) {

 		php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC);

 	}

+	check_http_proxy(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_ENV]));

 	zend_hash_update(&EG(symbol_table), name, name_len + 1, &PG(http_globals)[TRACK_VARS_ENV], sizeof(zval *), NULL);

 	Z_ADDREF_P(PG(http_globals)[TRACK_VARS_ENV]);

-- 

2.1.4