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

  Reformat some long-lines >80 and delete a number of truly dead (voted
  down) suggestions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@290740 13f79535-47bb-0310-9956-ffa450edef68
parent ada86613
Loading
Loading
Loading
Loading
+7 −66
Changes for STATUS: 7 added lines, 66 removed lines.
Original line number Diff line number Diff line
@@ -121,10 +121,10 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         do we have to wait for later APR 0.x release before putting
         calls to apr_procattr_addrspace_set() into httpd-2.0.x, or
         do we go ahead and introduce the prerequisite?
       clar replies: I am ready to commit the apr 0.9.x patch, but then will need 
         the changes in the httpd-2.0.x to be done in order for NetWare to work
         as expected when calling apr_proc_create. Should I do both, APR and Http,
         at the same time?
       clar replies: I am ready to commit the apr 0.9.x patch, but then will 
         need the changes in the httpd-2.0.x to be done in order for NetWare 
         to work as expected when calling apr_proc_create. Should I do both, 
         APR and Http, at the same time?
       wrowe: commit to APR.  Use an APR version test *in httpd* to determine 
         if the old or new behavior should be used in httpd.  In future versions
         you could remove the test altogether.
@@ -211,9 +211,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:

    *) Provide TLS/SSL upgrade functionality in mod_ssl allowing an unsecure
       connection to be upgraded to a secure connection upon request by the
       client.  The full patch file is available at http://www.apache.org/~bnicholes/
       as well as a test client tlsupgrade.c. This functionality is mainly used by
       IPP clients today.
       client.  The full patch is available at http://www.apache.org/~bnicholes/
       as well as a test client tlsupgrade.c. This functionality is mainly used
       by IPP clients today.
          modules/ssl/mod_ssl.c: r1.75, r1.97, r1.100
          modules/ssl/mod_ssl.h: r1.123
          modules/ssl/ssl_engine_config.c: r1.71, r1.90
@@ -297,41 +297,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:

PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:

    *) Remove LDAP toolkit specific code from util_ldap and mod_auth_ldap.
         modules/experimental/mod_auth_ldap.c: 1.28
         modules/experimental/util_ldap.c: 1.36
       +0: minfrin (this requires the apr-util LDAP overhaul to be ported to
                    apr-util v0.9 first)
       -0: jerenkrantz
           jerenkrantz: I don't think we can change the APR 0.9 interfaces.
                        They are supposed to be set in stone.
       -1:  wrowe: agrees with jerenkrantz, further realized that this major
                   change in APR 1.0 caused -every- apr-util linked app to have
                   the ldap sdk (openldap etc) linked in, and our --static-support
                   stuff is horribly broken by this change.  Not that it's wrong,
                   we need to look at making it slightly more dynamic for those
                   apps that don't touch ldap.

    *) Add load balancer support to the scoreboard in preparation for
       load balancing support in mod_proxy.
         include/scoreboard.h: 1.52
         server/scoreboard.c: 1.75
       +0: minfrin: it makes sense for v2.1 or v2.2
       -0: nd, jerenkrantz
           nd: -0 as in "it should be considered as a 2.1 feature".
              If the modified structures are public (are they?), I'm just -1.
           jerenkrantz: Sounds like a good 2.1 feature...
       -1: wrowe (make this a private score to the module and you would be fine;
                  we don't need to keep overloading a single scoreboard.)

    *) mod_ssl: Remove some unused functions (after CAN-2004-0488 fix is applied)
       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/ssl/ssl_util.c?r1=1.46&r2=1.47
       +1: jorton
       trawick: need changes to mod_ssl.h to remove prototypes for those removed functions
       0: nd: IMHO that's a public API change then and not applicable for
              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
       atomic operations for higher concurrency.
         server/mpm/worker/fdqueue.c 1.24, 1.25
@@ -444,12 +409,6 @@ PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:

CURRENT VOTES:

    *) 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;

      a) httpd-std.conf should be tailored by install (from src or
@@ -461,28 +420,10 @@ CURRENT VOTES:
                   (.default.conf rather than .conf.default so that win32
                    can recognize .conf files as text configuration files.)

      b) tailored httpd-std.conf should be copied by install to
         sysconfdir/examples
         -0:   striker

      c) tailored httpd-std.conf should be installed to
         sysconfdir/examples or manualdir/exampleconf/
         +1:   slive, trawick, Ken, nd (prefer the latter), erikabele

      d) tailored httpd-std.conf should be installed as httpd-std-<version>.conf.
         +1:   striker

      e) Installing a set of default config files when upgrading a server
         doesn't make ANY sense at all.
         +1:   ianh - medium/big sites don't use 'standard config' anyway, as it
                      usually needs major customizations
         -1:   Ken, wrowe, jwoolley, jim, nd, erikabele
           wrowe - diff is wonderful when comparing old/new default configs,
                   even for customized sites that ianh mentions
           jim - it makes sense assuming that the default configs
                 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
       "gracefully" self-terminate. Or maybe we should make it a runtime
       option, or have a concept of 2 parent processes (one being a