com php-src: CS fix and comments with bug ID: main/SAPI.c main/php_variables.c

Commit: aca4f65c7e98b9f07ac625eaf6be8eadbeb55929 Author: Stanislav Malyshev <stas@php.net> Tue, 12 Jul 2016 21:35:02 -0700 Parents: 98b9dfaec95e6f910f125ed172cdbd25abd006ec Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aca4f65c7e98b9f07ac625eaf6be8eadbeb55929 Log: CS fix and comments with bug ID Changed paths: M main/SAPI.c M main/php_variables.c Diff: diff --git a/main/SAPI.c b/main/SAPI.c index 8a56c6d..223c510 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 bbe57d3..5977a5e 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");