httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r696748 - in /httpd/httpd/branches/2.2.x: ./ INSTALL STATUS docs/ support/ab.c support/suexec.c
Date Thu, 18 Sep 2008 18:16:08 GMT
Author: jim
Date: Thu Sep 18 11:16:07 2008
New Revision: 696748

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

* INSTALL: Add a blurb about --with-included-apr option.

Submitted by: Tim Bray
Tweaked by: jerenkrantz

Submitted by: jerenkrantz
Reviewed by: jim

Modified:
    httpd/httpd/branches/2.2.x/   (props changed)
    httpd/httpd/branches/2.2.x/INSTALL
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/docs/   (props changed)
    httpd/httpd/branches/2.2.x/support/ab.c   (props changed)
    httpd/httpd/branches/2.2.x/support/suexec.c   (props changed)

Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 18 11:16:07 2008
@@ -1 +1 @@
-/httpd/httpd/trunk:647395,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728
+/httpd/httpd/trunk:647395,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728,696006

Modified: httpd/httpd/branches/2.2.x/INSTALL
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/INSTALL?rev=696748&r1=696747&r2=696748&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/INSTALL (original)
+++ httpd/httpd/branches/2.2.x/INSTALL Thu Sep 18 11:16:07 2008
@@ -17,12 +17,12 @@
               might use "/usr/local/apache2" for PREFIX (without the
               quotes).
 
-            * If you want to build a threaded MPM (for instance worker)
-              on  FreeBSD, be aware that threads do not work well with
-              Apache on FreeBSD versions before 5.4-RELEASE. If you wish
-              to try a threaded Apache on an earlier version of FreeBSD,
-              use the --enable-threads parameter to ./configure in
-              addition to the --with-mpm parameter.
+            * If you are a developer who will be linking your code with
+              Apache or using a debugger to step through server code,
+              ./configure's --with-included-apr option may be advantageous,
+              as it removes the possibility of version or compile-option
+              mismatches with APR and APR-util code.  (Many OSes now
+              include their own version of APR and APR-util.)
 
             * If you are a developer building Apache directly from
               Subversion, you will need to run ./buildconf before running
@@ -31,6 +31,13 @@
               build Apache from a release tarball, you don't have to run
               buildconf.
 
+            * If you want to build a threaded MPM (for instance worker)
+              on  FreeBSD, be aware that threads do not work well with
+              Apache on FreeBSD versions before 5.4-RELEASE. If you wish
+              to try a threaded Apache on an earlier version of FreeBSD,
+              use the --enable-threads parameter to ./configure in
+              addition to the --with-mpm parameter.
+
             * If you are building directly from Subversion on Mac OS X
               (Darwin), make sure to use GNU Libtool 1.4.2 or newer. All
               recent versions of the developer tools on this platform

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=696748&r1=696747&r2=696748&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Sep 18 11:16:07 2008
@@ -161,12 +161,6 @@
    +1: chrisd
    -0: jim (would prefer to see in 2.4, and to push 2.4 out)
 
- * INSTALL: Provide a breadcrumb as to why you would use --with-included-apr
-   Trunk version of patch:
-     http://svn.apache.org/viewvc?rev=696006&view=rev
-   Backport version for 2.2.x of patch:
-      Trunk version of patch works
-   +1: jerenkrantz, sctemme, jim
 
 PATCHES/ISSUES THAT ARE STALLED
 

Propchange: httpd/httpd/branches/2.2.x/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 18 11:16:07 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/docs:647395,660461,660566,664330,675610,678761,681190,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325,693392,693727-693728
+/httpd/httpd/trunk/docs:647395,660461,660566,664330,675610,678761,681190,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325,693392,693727-693728,696006

Propchange: httpd/httpd/branches/2.2.x/support/ab.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 18 11:16:07 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/support/ab.c:83751-655654,657433,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728
+/httpd/httpd/trunk/support/ab.c:83751-655654,657433,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728,696006

Propchange: httpd/httpd/branches/2.2.x/support/suexec.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 18 11:16:07 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/support/suexec.c:647395,655711,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728
+/httpd/httpd/trunk/support/suexec.c:647395,655711,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728,696006



Mime
View raw message