httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r312906 - in /httpd/httpd: branches/2.2.x/CHANGES branches/2.2.x/server/main.c trunk/CHANGES
Date Tue, 11 Oct 2005 16:11:22 GMT
Author: colm
Date: Tue Oct 11 09:11:16 2005
New Revision: 312906

URL: http://svn.apache.org/viewcvs?rev=312906&view=rev
Log:
merge r265737 from trunk.

Author: trawick
Reviewed by: colm

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/server/main.c
    httpd/httpd/trunk/CHANGES

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=312906&r1=312905&r2=312906&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Oct 11 09:11:16 2005
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.1.9
 
+  *) httpd.exe/apachectl -V: display the DYNAMIC_MODULE_LIMIT setting, as
+     in 1.3.  [Jeff Trawick]
+
   *) Support dbd connection tied to conn_rec in mod_dbd [Nick Kew]
 
   *) Fix use of pools in mod_dbd [Brian J France, Nick Kew]

Modified: httpd/httpd/branches/2.2.x/server/main.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/main.c?rev=312906&r1=312905&r2=312906&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/main.c (original)
+++ httpd/httpd/branches/2.2.x/server/main.c Tue Oct 11 09:11:16 2005
@@ -196,6 +196,8 @@
 #endif
 #endif
 
+    printf(" -D DYNAMIC_MODULE_LIMIT=%ld\n",(long)DYNAMIC_MODULE_LIMIT);
+
 #if APR_CHARSET_EBCDIC
     printf(" -D APR_CHARSET_EBCDIC\n");
 #endif

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=312906&r1=312905&r2=312906&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Oct 11 09:11:16 2005
@@ -2,9 +2,6 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) httpd.exe/apachectl -V: display the DYNAMIC_MODULE_LIMIT setting, as
-     in 1.3.  [Jeff Trawick]
-
   *) mod_log_config: %{hextid}P will log the thread id in hex with APR
      versions 1.2.0 or higher.  [Jeff Trawick]
 
@@ -17,6 +14,9 @@
      [Martin Kraemer, David Reid]
 
 Changes with Apache 2.1.9
+
+  *) httpd.exe/apachectl -V: display the DYNAMIC_MODULE_LIMIT setting, as
+     in 1.3.  [Jeff Trawick]
 
   *) Support dbd connections tied to the conn_rec [Nick Kew]
 



Mime
View raw message