We already extract e for subprocess_env, and set SECURE_SERVER_PORT

  for real.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90589 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index fc4177aceecc502873753f6fd782ce673cf8b500..17239dd51531d4506ccfe65e6db075215b98ba7b 100644 (file)
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -352,6 +352,7 @@ apr_status_t isapi_handler (request_rec *r)
     apr_status_t rv;
     isapi_loaded *isa;
     isapi_cid *cid;
+    const char *val;
     DWORD read;
     int res;
     
@@ -383,9 +384,12 @@ apr_status_t isapi_handler (request_rec *r)
     /* Set up variables */
     ap_add_common_vars(r);
     ap_add_cgi_vars(r);
-    apr_table_setn(r->subprocess_env, "UNMAPPED_REMOTE_USER", "REMOTE_USER");
-    apr_table_setn(r->subprocess_env, "SERVER_PORT_SECURE", "0");
-    apr_table_setn(r->subprocess_env, "URL", r->uri);
+    apr_table_setn(e, "UNMAPPED_REMOTE_USER", "REMOTE_USER");
+    if ((val = apr_table_get(e, "HTTPS")) && strcmp(val, "on"))
+        apr_table_setn(e, "SERVER_PORT_SECURE", "1");
+    else
+        apr_table_setn(e, "SERVER_PORT_SECURE", "0");
+    apr_table_setn(e, "URL", r->uri);
 
     /* Set up connection structure and ecb */
     cid = apr_pcalloc(r->pool, sizeof(isapi_cid));