From 2c0ab6fc33bbe8f5d7c0cb14ff614eab0e297109 Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Thu, 18 Aug 2011 19:12:49 +0000 Subject: [PATCH] Bug #55403: Don't set $_SERVER['HTTPS'] on unsecure connection --- NEWS | 3 +++ sapi/nsapi/nsapi.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 88bae410ff..2f0b5cf633 100644 --- 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 13d0209f58..85a6767264 100644 --- 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 */ -- 2.40.0