summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Schindler <thetaphi@php.net>2011-08-11 20:25:24 +0000
committerUwe Schindler <thetaphi@php.net>2011-08-11 20:25:24 +0000
commit96eff171611d04fc8025c0c526a589de63226a49 (patch)
tree48372690a1027467d15b482effe442c1ada901cf
parent78c823067f66de77bb3424b523dc5d7bf242d46a (diff)
downloadphp-git-96eff171611d04fc8025c0c526a589de63226a49.tar.gz
Bug #55403: Don't set $_SERVER['HTTPS'] on unsecure connection
-rw-r--r--sapi/nsapi/nsapi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index fa73301f62..a2081eb0c8 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -723,7 +723,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 */