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

  Anyone object to sharing the same indentation?  :)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@264633 13f79535-47bb-0310-9956-ffa450edef68
parent c8734024
Loading
Loading
Loading
Loading
+16 −16
Changes for STATUS: 16 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
          nd: I'm going to reverse the default
          jerenkrantz, striker: I'm confused as to the status of this backport.

    * support/check_forensic: Fix tempfile usage
    *) support/check_forensic: Fix tempfile usage
       svn rev 125495, 126224
       jerenkrantz says: r126224 fixes brokenness with r125495 on Solaris.
       +1: thommay, jerenkrantz, trawick
@@ -184,7 +184,7 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                    it as-is.  For the one or two platforms that don't like 
                    which, they can write their own version of the script.

    * Win32: Move call to mpm_service_install to the rewrite_args hook
    *) Win32: Move call to mpm_service_install to the rewrite_args hook
       from the post_config hook.
         http://svn.apache.org/viewcvs?view=rev&rev=154319
       +1: stoddard, striker, wrowe (as corrected in subsequent patches)
@@ -363,7 +363,7 @@ PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
              2.0, just let 'em in
       -1: wrowe (as nd suggests, leave the dead horse in peace.)

    * Replace some of the mutex locking in the worker MPM with
    *) Replace some of the mutex locking in the worker MPM with
       atomic operations for higher concurrency.
         server/mpm/worker/fdqueue.c 1.24, 1.25
       +1: brianp, ianh, jjclar
@@ -376,12 +376,12 @@ PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
                favour waiting for 2.2.
       -0: stoddard (at least until the performance implications are clarified)

    * Allow mod_dav to do weak entity comparison functions.
    *) Allow mod_dav to do weak entity comparison functions.
       modules/dav/main/util.c: r1.45
       [ This one is under review.  Don't merge.  ]
       +1:

    * mod_negotiation: parse quality values independent from
    *) mod_negotiation: parse quality values independent from
       the current locale and level values as integers. PR 17564.
       (essentially: get a rid of atof()) (2.0 + 1.3)
       modules/mappers/mod_negotiation.c: r1.114
@@ -392,14 +392,14 @@ PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
         1.0: nd
         0.0: jim (a default != an "errored" value)

    * Keep the same SSLMutex for the lifetime of the parent process
    *) Keep the same SSLMutex for the lifetime of the parent process
       (instead of having children using different mutexes and failing
       to lock the session cache across restarts.)
       New patch forthcoming - JimJag's changes make the merge ugly.
       +1: wrowe
       +1 (concept): jim (final vote when the patch is available)

    * Fix the SSLMutex config parser so that all 'mechanisms' can take
    *) Fix the SSLMutex config parser so that all 'mechanisms' can take
       a filename, even if ignored, and they are rooted to the full path
       to the server (except for posixsem locks).  This allows a very
       cross-platform default:logs/ssl_mutex to be used everywhere.  Also
@@ -409,7 +409,7 @@ PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
       +1: wrowe
       +1 (concept): jim (final vote when the patch is available)

    * mod_ssl: Drop SSL_EXPERIMENTAL_ENGINE test in favor of testing for the
    *) mod_ssl: Drop SSL_EXPERIMENTAL_ENGINE test in favor of testing for the
       ENGINE_init() function in config.m4, and use HAVE_ENGINE_INIT instead.
       wrowe notes that this feature is a noop until configured with SSLEngine.
       http://www.apache.org/~wrowe/have_engine_init.patch for a clean 2.0 patch.
@@ -424,7 +424,7 @@ PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
                  shows breakage on Solaris which can't -lcrypto -lssl without
                  the extra pkgconfig/openssl.pc Libs: * foo }

    * mod_ssl: fix a link failure when the openssl-engine libraries are
    *) mod_ssl: fix a link failure when the openssl-engine libraries are
       present but the engine headers are missing.
         modules/ssl/mod_ssl.c: r1.87
         modules/ssl/mod_ssl.h: r1.139
@@ -432,7 +432,7 @@ PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
       PREREQ: Blow away of SSL_EXPERIMENTAL_ENGINE (see above)
       +1: jwoolley, trawick, jim, jerenkrantz

    * When UseCanonicalName is set to OFF, allow ap_get_server_port to 
    *) When UseCanonicalName is set to OFF, allow ap_get_server_port to 
       check r->connection->local_addr->port before defaulting to 
       server->port or ap_default_port()
         server/core.c r1.247
@@ -448,11 +448,11 @@ PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
	    which implements this, keeping UseCanonicalName Off
 	    "as is".

    * ThreadStackSize for Win32 and threaded MPMs
    *) ThreadStackSize for Win32 and threaded MPMs
       trawick will eventually put together a patch for httpd 2.0.next
       +1 concept: trawick, nd, stoddard, wrowe
      
    * don't propagate input headers describing a body to a GET subrequest
    *) don't propagate input headers describing a body to a GET subrequest
       with no body
       http://svn.apache.org/viewcvs?view=rev&rev=158798
       http://svn.apache.org/viewcvs?view=rev&rev=159410
@@ -475,13 +475,13 @@ PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:

CURRENT VOTES:

    * Promote mod_ldap and mod_auth_ldap from experimental to
    *) Promote mod_ldap and mod_auth_ldap from experimental to
       non experimental status.
       +1: bnicholes, wrowe
       +0: minfrin (wait till the last cache bugs are ironed out)
       -1: jerenkrantz

    * httpd-std.conf and friends;
    *) httpd-std.conf and friends;

      a) httpd-std.conf should be tailored by install (from src or
         binbuild) even if user has existing httpd.conf
@@ -514,7 +514,7 @@ CURRENT VOTES:
                 include the updated directives and inline comments
                 that explain the changes and make the 'diff' more useful.

    * If the parent process dies, should the remaining child processes
    *) If the parent process dies, should the remaining child processes
       "gracefully" self-terminate. Or maybe we should make it a runtime
       option, or have a concept of 2 parent processes (one being a 
       "hot spare").
@@ -530,7 +530,7 @@ CURRENT VOTES:
                       +0: Martin (while standing by, could it do
                                  something useful?)

    * Make the worker MPM the default MPM for threaded Unix boxes.
    *) Make the worker MPM the default MPM for threaded Unix boxes.
       +1:   Justin, Ian, Cliff, BillS, striker
       +0:   BrianP, Aaron (mutex contention is looking better with the
             latest code, let's continue tuning and testing), rederpj, jim