From: Christoph M. Becker <cmb@php.net>
Date: Sun, 9 Aug 2015 00:51:16 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc69549593cb1ab4f9fa0fd41d74000cd4a98894;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #66606: Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE
  added tests for bug #66606
---

fc69549593cb1ab4f9fa0fd41d74000cd4a98894
diff --cc sapi/cli/php_cli_server.c
index f76199af9a,00226782de..9c00fa0bdf
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@@ -604,7 -732,10 +604,10 @@@ static int sapi_cli_server_register_ent
  			}
  		}
  		spprintf(&real_key, 0, "%s_%s", "HTTP", key);
+ 		if (strcmp(key, "CONTENT_TYPE") == 0 || strcmp(key, "CONTENT_LENGTH") == 0) {
 -			sapi_cli_server_register_variable(track_vars_array, key, *entry TSRMLS_CC);
++			sapi_cli_server_register_variable(track_vars_array, key, *entry);
+ 		}
 -		sapi_cli_server_register_variable(track_vars_array, real_key, *entry TSRMLS_CC);
 +		sapi_cli_server_register_variable(track_vars_array, real_key, *entry);
  		efree(key);
  		efree(real_key);
  	}