Correctly evaluate the HTTPS condition string, update CHANGES for attributions

  and recent activity.

PR: 40573
Submitted by: Matt Eaton <asf divinehawk.com>
Backports: 429341

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@493281 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index db8e68ffa20bdd6afda19ff932281283a797e697..c063e64abf86bfa1a376f766d9bfcf4097eba232 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.4
 
+  *) mod_isapi: Correctly present SERVER_PORT_SECURE.
+     PR: 40573.  [Matt Eaton <asf divinehawk.com>]
+
   *) Allow htcacheclean, httxt2dbm, and fcgistarter to link apr/apr-util
      statically like the older support programs.
      [Eric Covener <covener gmail.com>]
@@ -114,14 +117,16 @@ Changes with Apache 2.2.4
      PR 40323.  [Jeff Trawick]
 
   *) mod_isapi: Avoid double trailing slashes in HSE_REQ_MAP_URL_TO_PATH
-     support.  Also corrects the slashes for Windows.  PR 15993.  [William Rowe]
+     support.  Also corrects the slashes for Windows.
+     PR 15993.  [William Rowe]
 
   *) mod_isapi: Handle "HTTP/1.1 200 OK" style status lines correctly, the
      token parser worked while the resulting length was misinterpreted.
      PR 29098.  [Brock Bland <bbland serena.com>]
 
   *) mod_isapi: Return 0 (failure) for more of the various ap_pass_brigade
-     attempts to stream the response at the client.  PR 30022.  [William Rowe]
+     attempts to stream the response at the client.  Log these as well.
+     PR 30022, 40470.  [William Rowe, Matt Eaton <asf divinehawk.com>]
 
   *) mod_isapi: Ensure we walk through all the methods the developer may have
      employed to report their HTTP status result code.

diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index 87ff7a5cb76352428b0dd422c5b5c86134459210..bfc26aadd1f487495f3ebd8c23b19384133d4dc1 100644 (file)
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -1453,7 +1453,7 @@ apr_status_t isapi_handler (request_rec *r)
     ap_add_common_vars(r);
     ap_add_cgi_vars(r);
     apr_table_setn(e, "UNMAPPED_REMOTE_USER", "REMOTE_USER");
-    if ((val = apr_table_get(e, "HTTPS")) && strcmp(val, "on"))
+    if ((val = apr_table_get(e, "HTTPS")) && (strcmp(val, "on") == 0))
         apr_table_setn(e, "SERVER_PORT_SECURE", "1");
     else
         apr_table_setn(e, "SERVER_PORT_SECURE", "0");