Bug #55403: Don't set $_SERVER['HTTPS'] on unsecure connection

This commit is contained in:
Uwe Schindler 2011-08-11 20:25:24 +00:00
parent 9e9d2a9ce6
commit acec8201a1
2 changed files with 6 additions and 1 deletions

3
NEWS
View file

@ -12,6 +12,9 @@ PHP NEWS
. Added Shift_JIS Emoji (pictograms) support. (rui) . Added Shift_JIS Emoji (pictograms) support. (rui)
. Ill-formed UTF-8 check for security enhancements. (rui) . Ill-formed UTF-8 check for security enhancements. (rui)
- Improved NSAPI SAPI: (Uwe Schindler)
. Don't set $_SERVER['HTTPS'] on unsecure connection (bug #55403).
04 Aug 2011, PHP 5.4.0 Alpha 3 04 Aug 2011, PHP 5.4.0 Alpha 3
- Added features: - Added features:
. Short array syntax, see UPGRADING guide for full details (rsky0711 at gmail . Short array syntax, see UPGRADING guide for full details (rsky0711 at gmail

View file

@ -723,7 +723,9 @@ static void sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_D
nsapi_free(value); nsapi_free(value);
php_register_variable("SERVER_SOFTWARE", system_version(), track_vars_array TSRMLS_CC); php_register_variable("SERVER_SOFTWARE", system_version(), track_vars_array TSRMLS_CC);
php_register_variable("HTTPS", (security_active ? "ON" : "OFF"), track_vars_array TSRMLS_CC); if (security_active) {
php_register_variable("HTTPS", "ON", track_vars_array TSRMLS_CC);
}
php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array TSRMLS_CC); php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array TSRMLS_CC);
/* DOCUMENT_ROOT */ /* DOCUMENT_ROOT */