summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--sapi/isapi/php4isapi.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 070916b8bf..4523862136 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,7 @@ PHP 4 NEWS
- Fixed bug #22544 (writing transparency to truecolor png images). (Ilia)
- Fixed bug #22520 (mcrypt_generic_deinit() was not available on Windows). (Edin)
- Fixed bug #22508 (Added protection against circular HTML redirects). (Ilia)
+- Fixed bug #22473 (ISAPI Secure Server variables not available). (Christian Swoboda)
- Fixed bug #22402 (opening of ftp for read/write could fail due to invalid
return code handling). (Ilia)
- Fixed bug #22384 (FNM_CASEFOLD is not available). (Hartmut)
diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c
index 34560dff98..1cbf8faf88 100644
--- a/sapi/isapi/php4isapi.c
+++ b/sapi/isapi/php4isapi.c
@@ -517,7 +517,9 @@ static void sapi_isapi_register_server_variables(zval *track_vars_array TSRMLS_D
sapi_isapi_register_server_variables2(isapi_server_variable_names, lpECB, track_vars_array, NULL TSRMLS_CC);
if (isapi_special_server_variables[SPECIAL_VAR_HTTPS]
- && atoi(isapi_special_server_variables[SPECIAL_VAR_HTTPS])) {
+ && (atoi(isapi_special_server_variables[SPECIAL_VAR_HTTPS])
+ || !strcasecmp(isapi_special_server_variables[SPECIAL_VAR_HTTPS], "on"))
+ ) {
/* Register SSL ISAPI variables */
sapi_isapi_register_server_variables2(isapi_secure_server_variable_names, lpECB, track_vars_array, NULL TSRMLS_CC);
}