thetaphi                                 Thu, 18 Aug 2011 19:12:49 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=315149

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

Bug: https://bugs.php.net/55403 (Assigned) $_SERVER['HTTPS'] should be 
undefined on unsecure connection
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2011-08-18 17:32:37 UTC (rev 315148)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-08-18 19:12:49 UTC (rev 315149)
@@ -2,6 +2,9 @@
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 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)

Modified: php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c     2011-08-18 17:32:37 UTC 
(rev 315148)
+++ php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c     2011-08-18 19:12:49 UTC 
(rev 315149)
@@ -727,7 +727,9 @@
        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 */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to