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

diff --git a/NEWS b/NEWS
index 88bae410ffdc45559b38c2378c074218c662ca7e..2f0b5cf633beac91704114218aeccf670d84178b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2011, PHP 5.3.8
 
+- Improved NSAPI SAPI: (Uwe Schindler)
+  . Don't set $_SERVER['HTTPS'] on unsecure connection (bug #55403).
+
 18 Aug 2011, PHP 5.3.7
 - Upgraded bundled SQLite to version 3.7.7.1. (Scott)
 - Upgraded bundled PCRE to version 8.12. (Scott)

diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 13d0209f58a7d8d356da7759dae89f5e985d0bc2..85a67672649bc19a9719e49c638c624f03ce39cc 100644 (file)
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -727,7 +727,9 @@ static void sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_D
        nsapi_free(value);
 
        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);
 
        /* DOCUMENT_ROOT */