diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-07-12 21:35:02 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-07-12 21:35:02 -0700 |
| commit | aca4f65c7e98b9f07ac625eaf6be8eadbeb55929 (patch) | |
| tree | 9340e0ecbfa34b91a43d2b85ba55b043641b61a9 | |
| parent | 98b9dfaec95e6f910f125ed172cdbd25abd006ec (diff) | |
| download | php-git-aca4f65c7e98b9f07ac625eaf6be8eadbeb55929.tar.gz | |
CS fix and comments with bug ID
| -rw-r--r-- | main/SAPI.c | 2 | ||||
| -rw-r--r-- | main/php_variables.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index 8a56c6d61c..223c51021b 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -1012,7 +1012,7 @@ SAPI_API struct stat *sapi_get_stat(TSRMLS_D) SAPI_API char *sapi_getenv(char *name, size_t name_len TSRMLS_DC) { if (!strncasecmp(name, "HTTP_PROXY", name_len)) { - /* Ugly fix for HTTP_PROXY issue */ + /* Ugly fix for HTTP_PROXY issue, see bug #72573 */ return NULL; } if (sapi_module.getenv) { diff --git a/main/php_variables.c b/main/php_variables.c index bbe57d3955..5977a5ed97 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -722,8 +722,9 @@ static zend_bool php_auto_globals_create_files(const char *name, uint name_len T return 0; /* don't rearm */ } -/* Upgly hack to fix HTTP_PROXY issue */ -static void check_http_proxy(HashTable *var_table) { +/* Upgly hack to fix HTTP_PROXY issue, see bug #72573 */ +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"); |