Commit 0d829437 authored by Andre Malo's avatar Andre Malo
Browse files

mod_version_for_2.0.x branch:

* Merge 291277 to 326117 from branches/2.0.x



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/mod_version_for_2.0.x@326121 13f79535-47bb-0310-9956-ffa450edef68
parent de5b3dbc
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
                                                         -*- coding: utf-8 -*-
Changes with Apache 2.0.55
Changes with Apache 2.0.56
  *) Added new module mod_version, which provides version dependent
     configuration containers.  [André Malo]
@@ -8,6 +8,16 @@ Changes with Apache 2.0.55
     accompanying ap_version_t structure (minor MMN bump).
     [André Malo]
Changes with Apache 2.0.55
  *) SECURITY: CAN-2005-2700 (cve.mitre.org)
     mod_ssl: Fix a security issue where "SSLVerifyClient" was not
     enforced in per-location context if "SSLVerifyClient optional"
     was configured in the vhost configuration.  [Joe Orton]
  *) worker MPM: Fix a memory leak which can occur after an aborted
     connection in some limited circumstances.  [Greg Ames]
  *) mod_ldap: Fix PR 36563. Keep track of the number of attributes
     retrieved from LDAP so that all of the values can be properly 
     cached even if the value is NULL. 
+26 −14
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ Consult the trunk/ for all new development and documentation efforts:

Release history:

    2.0.55  : in development
    2.0.56  : in development
    2.0.55  : tagged October 9, 2005
    2.0.54  : released April 17, 2005 as GA.
    2.0.53  : released February 7, 2005 as GA.
    2.0.52  : released September 28, 2004 as GA.
@@ -99,7 +100,8 @@ CURRENT RELEASE NOTES:

    * All commits to branches/2.0.x must be reflected in SVN trunk,
      as well, if they apply.  Logical progression is commit to trunk,
      get feedback and votes in STATUS, and then merge into branches/2.0.x.
      get feedback and votes on list or in STATUS, then merge into 
      branches/2.2.x, and finally merge into branches/2.0.x, as applicable.


RELEASE SHOWSTOPPERS:
@@ -150,17 +152,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       +1: pquerna, nd, wrowe
       Votes from before the integration branch: +1: jerenkrantz


PATCHES PROPOSED TO BACKPORT FROM TRUNK:
  [ please place SVN revisions from trunk here, so it is easy to
    identify exactly what the proposed changes are!  Add all new
    proposals to the end of this list. ]

    *) Fix CAN-2005-2700, mod_ssl SSLVerifyClient bug
         http://svn.apache.org/viewcvs?rev=264800&view=rev
       test case: perl-framework/t/security/CAN-2005-2700.t
       +1: jorton, wrowe
       wrowe cautions to backport to 2.2.x branch as well.

    *) mod_headers: Support {...}s tag for SSL variable lookup.
       http://www.apache.org/~jorton/mod_headers-2.0-ssl.diff
       +1: jorton, trawick
@@ -229,11 +226,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        +1: pquerna, jerenkrantz, colm
        jerenkrantz notes: I do prefer the version from r190033 (own if check).

     *) mod_ssl: Fix buffering in SSL output filter.
        http://svn.apache.org/viewcvs?rev=189971&view=rev
        PR: 35279
        +1: jorton, jerenkrantz

     *) Reverse Proxy fixes: <Location> bug and Cookie support
        Patch is at
        http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=112365629308138&q=p4
@@ -260,11 +252,31 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       code: http://svn.apache.org/viewcvs?view=rev&rev=157583
             http://svn.apache.org/viewcvs?rev=280401&view=rev
       docs: http://svn.apache.org/viewcvs?rev=280384&view=rev
       +1: stas
       +1: stas, trawick
       -0: colm
           colm: It's a useful feature, but TCP window size selection 
                 algorithims can be pretty "interesting", probably more
                 2.2. 
           trawick: It is nevertheless true that POST performance can 
                 sometimes improve dramatically by tweaking the receive
                 buffer size, and this relatively simple patch lets that
                 be controlled in a portable manner just for the web 
                 server.  (old way: use system-specific configuration
                 knobs that affect all applications.)

    *) Fix all non-http protocol modules that were modeled after the
       broken mod_echo.c example; remove the -initial- timeout setting
       from NET_TIME (never inserted by non-request based protocols)
       and move it to the core pre_connection logic, so every core
       connection can read with timeout on Linux, Solaris, instead of
       read (untimed) blocking on Linux, and failing read non-block on
       Solaris.  Leaves NET_TIME intact until after the 2.0.x branch.
         http://people.apache.org/~wrowe/httpd-2.0-proto-timeout.patch
         +1: wrowe

    *) Add missing va_end call
         http://svn.apache.org/viewcvs?rev=321500&view=rev
       +1: nd, trawick

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

+6 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-root
BuildPrereq: apr-devel, apr-util-devel, openldap-devel, db4-devel, expat-devel, findutils, perl, pkgconfig
BuildPrereq: /usr/bin/apr-config, /usr/bin/apu-config
Requires: apr >= 0.9.5, apr-util >= 0.9.5, gawk, /usr/share/magic.mime, /usr/bin/find, openldap
Requires: apr >= 0.9.7, apr-util >= 0.9.7, gawk, /usr/share/magic.mime, /usr/bin/find, openldap
Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv
Prereq: sh-utils, textutils, /usr/sbin/useradd
Provides: webserver
@@ -37,7 +37,7 @@ Group: Development/Libraries
Summary: Development tools for the Apache HTTP server.
Obsoletes: secureweb-devel, apache-devel
Requires: libtool, httpd = %{version}
Requires: apr-devel >= 0.9.5, apr-util-devel >= 0.9.5
Requires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7

%description devel
The httpd-devel package contains the APXS binary and other files
@@ -203,7 +203,6 @@ echo %{mmn} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn
# docroot
mkdir $RPM_BUILD_ROOT%{contentdir}/html
rm -r $RPM_BUILD_ROOT%{contentdir}/manual/style
rm $RPM_BUILD_ROOT%{contentdir}/manual/*/*.xml

# logs
rmdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/logs
@@ -369,6 +368,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/instdso.sh

%changelog
* Tue Oct 11 2005 Graham Leggett <minfrin@apache.org> 2.0.56-dev
- Updated the apr and apr-util dependencies to require at least v0.9.7
- Stop trying to remove *.xml doc files, the httpd build does that already.

* Thu Dec 16 2004 Graham Leggett <minfrin@apache.org> 2.0.53-dev
- Changed build to use external apr and apr-util

+549 −523

File changed.

Preview size limit exceeded, changes collapsed.

+537 −511

File changed.

Preview size limit exceeded, changes collapsed.

Loading