httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r892259 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/config5.m4
Date Fri, 18 Dec 2009 14:12:03 GMT
Author: jim
Date: Fri Dec 18 14:12:02 2009
New Revision: 892259

URL: http://svn.apache.org/viewvc?rev=892259&view=rev
Log:
Merge r880794 from trunk:

Build: fix --with-module to work as documented
PR 43881
Submitted: Gez Saunders
Reviewed: Nick Kew


Submitted by: niq
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/config5.m4

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=892259&r1=892258&r2=892259&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Dec 18 14:12:02 2009
@@ -8,6 +8,9 @@
      control is still vulnerable, unless using OpenSSL >= 0.9.8l.  
      [Joe Orton, Ruediger Pluem]
 
+   *) Build: fix --with-module to work as documented
+      PR 43881 [Gez Saunders <???>]
+
    *) mod_mime: Make RemoveType override the info from TypesConfig.
       PR 38330. [Stefan Fritsch]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=892259&r1=892258&r2=892259&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Dec 18 14:12:02 2009
@@ -87,11 +87,6 @@
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * build: fix --with-module option to work as documented
-    PR 43881
-    Patch: http://svn.apache.org/viewvc?rev=880794&view=rev
-    +1: niq, pgollucci, rjung, jim
-
   * mod_disk_cache, mod_mem_cache: don't cache incomplete responses,
     per RFC 2616, 13.8.
     PR 15866

Modified: httpd/httpd/branches/2.2.x/modules/config5.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/config5.m4?rev=892259&r1=892258&r2=892259&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/config5.m4 (original)
+++ httpd/httpd/branches/2.2.x/modules/config5.m4 Fri Dec 18 14:12:02 2009
@@ -18,7 +18,7 @@
         fi
         cp $pkg $modpath_current/$modfilec
       fi
-      module=`echo $pkg | sed -e 's;\(.*/\)*mod_\(.*\).c;\2;'`
+      module=`echo $pkg | sed -e 's;\(.*/\).*mod_\(.*\).c;\2;'`
       objects="mod_$module.lo"
       # The filename of a convenience library must have a "lib" prefix:
       libname="libmod_$module.la"



Mime
View raw message