Commit e988ac52 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

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
parent fc3bc62a

CHANGES

+7 −2
Changes for CHANGES: 7 added lines, 2 removed lines.
Original line number Diff line number Diff line 
                                                        -*- 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.


































modules/arch/win32/mod_isapi.c



+1
−1



























Changes for modules/arch/win32/mod_isapi.c: 1 added line, 1 removed line.



Original line number
Diff line number
Diff line







@@ -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");