You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2009/10/06 23:27:14 UTC

svn commit: r822511 - in /httpd/mod_fcgid/trunk: CHANGES-FCGID Makefile-fcgid.win README-FCGID build/fixconf.sed docs/manual/mod/mod_fcgid.html.en docs/manual/mod/mod_fcgid.xml modules/fcgid/fcgid_config.h.in tools/fixconf.sed

Author: wrowe
Date: Tue Oct  6 21:27:13 2009
New Revision: 822511

URL: http://svn.apache.org/viewvc?rev=822511&view=rev
Log:
not sure why we reinvented the same script three times in one package :)

Added:
    httpd/mod_fcgid/trunk/build/fixconf.sed   (props changed)
      - copied unchanged from r822507, httpd/mod_fcgid/trunk/tools/fixconf.sed
Removed:
    httpd/mod_fcgid/trunk/tools/fixconf.sed
Modified:
    httpd/mod_fcgid/trunk/CHANGES-FCGID
    httpd/mod_fcgid/trunk/Makefile-fcgid.win
    httpd/mod_fcgid/trunk/README-FCGID
    httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.html.en
    httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.xml
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_config.h.in   (props changed)

Modified: httpd/mod_fcgid/trunk/CHANGES-FCGID
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/CHANGES-FCGID?rev=822511&r1=822510&r2=822511&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] (original)
+++ httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] Tue Oct  6 21:27:13 2009
@@ -31,7 +31,7 @@
   *) All directives have been renamed in order to use a common prefix "FCGID".
      Underscores in directive names have been eliminated in favor of
      CamelCase. The old directive names will still work but are deprecated.
-     To fix your configuration you can use the sed script tools/fixconf.sed.
+     To fix your configuration you can use the sed script build/fixconf.sed.
      The following tables contains old and new directive names.
 
      Old Name                           New Name

Modified: httpd/mod_fcgid/trunk/Makefile-fcgid.win
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/Makefile-fcgid.win?rev=822511&r1=822510&r2=822511&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/Makefile-fcgid.win (original)
+++ httpd/mod_fcgid/trunk/Makefile-fcgid.win Tue Oct  6 21:27:13 2009
@@ -49,7 +49,9 @@
 APACHE2_HOME=$(INSTDIR)
 !ENDIF
 
-!IF EXIST("$(APACHE2_HOME)\lib\libapr-1.lib")
+!IF EXIST("$(APACHE2_HOME)\lib\libapr-2.lib")
+APACHE2_APRSFX=-2
+!ELSEIF EXIST("$(APACHE2_HOME)\lib\libapr-1.lib")
 APACHE2_APRSFX=-1
 !ELSEIF EXIST("$(APACHE2_HOME)\lib\libapr.lib")
 APACHE2_APRSFX=

Modified: httpd/mod_fcgid/trunk/README-FCGID
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/README-FCGID?rev=822511&r1=822510&r2=822511&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/README-FCGID (original)
+++ httpd/mod_fcgid/trunk/README-FCGID Tue Oct  6 21:27:13 2009
@@ -49,6 +49,11 @@
 
     # ADD LINK32 libapr.lib libaprutil.lib ...
 
+If using httpd development version 2.3 plus APR 2.0, replace both 
+of these entries with the single (combined) entry;
+
+    # ADD LINK32 libapr-2.lib ...
+
 To build on windows out-of-tree as a DSO, simply
 
     set APACHE2_HOME=c:\path\to\Apache2.2
@@ -139,7 +144,7 @@
 i.   All directives have been renamed in order to use a common prefix "FCGID".
      Underscores in directive names have been eliminated in favor of
      CamelCase. The old directive names will still work but are deprecated.
-     To fix your configuration you can use the sed script tools/fixconf.sed.
+     To fix your configuration you can use the sed script build/fixconf.sed.
      A table with old and new directive names is included in CHANGES-FCGID.
 
 ii.  Some directives which could be placed inside <VirtualHost > but were

Propchange: httpd/mod_fcgid/trunk/build/fixconf.sed
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/mod_fcgid/trunk/build/fixconf.sed
------------------------------------------------------------------------------
    svn:executable = *

Modified: httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.html.en
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.html.en?rev=822511&r1=822510&r2=822511&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.html.en (original)
+++ httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.html.en Tue Oct  6 21:27:13 2009
@@ -120,7 +120,7 @@
       <li>All directives have been renamed in order to use a common prefix "FCGID".
       Underscores in directive names have been eliminated in favor of
       CamelCase. The old directive names will still work but are deprecated.
-      To fix your configuration you can use the sed script tools/fixconf.sed.
+      To fix your configuration you can use the sed script build/fixconf.sed.
       The following table contains old and new directive names:
       <table class="bordered"><tr class="header"><th>Old Name</th><th>New Name</th></tr>
 <tr>

Modified: httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.xml
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.xml?rev=822511&r1=822510&r2=822511&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.xml (original)
+++ httpd/mod_fcgid/trunk/docs/manual/mod/mod_fcgid.xml Tue Oct  6 21:27:13 2009
@@ -69,7 +69,7 @@
       <li>All directives have been renamed in order to use a common prefix "FCGID".
       Underscores in directive names have been eliminated in favor of
       CamelCase. The old directive names will still work but are deprecated.
-      To fix your configuration you can use the sed script tools/fixconf.sed.
+      To fix your configuration you can use the sed script build/fixconf.sed.
       The following table contains old and new directive names:
       <table border="1" style="zebra">
         <tr><th>Old Name</th><th>New Name</th></tr>

Propchange: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_config.h.in
------------------------------------------------------------------------------
    svn:eol-style = native