httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r493281 - in /httpd/httpd/branches/2.2.x: CHANGES modules/arch/win32/mod_isapi.c
Date Sat, 06 Jan 2007 03:10:29 GMT
Author: wrowe
Date: Fri Jan  5 19:10:28 2007
New Revision: 493281

URL: http://svn.apache.org/viewvc?view=rev&rev=493281
Log:
  Correctly evaluate the HTTPS condition string, update CHANGES for attributions
  and recent activity.

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

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/modules/arch/win32/mod_isapi.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=493281&r1=493280&r2=493281
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Jan  5 19:10:28 2007
@@ -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 @@
      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.

Modified: httpd/httpd/branches/2.2.x/modules/arch/win32/mod_isapi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/arch/win32/mod_isapi.c?view=diff&rev=493281&r1=493280&r2=493281
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/arch/win32/mod_isapi.c (original)
+++ httpd/httpd/branches/2.2.x/modules/arch/win32/mod_isapi.c Fri Jan  5 19:10:28 2007
@@ -1453,7 +1453,7 @@
     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");



Mime
View raw message