You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2009/10/20 13:40:35 UTC
svn commit: r827039 - in /httpd/mod_fcgid/trunk: CHANGES-FCGID build/fixconf.sed

Author: trawick
Date: Tue Oct 20 11:40:35 2009
New Revision: 827039

URL: http://svn.apache.org/viewvc?rev=827039&view=rev
Log:
Fix a bug in fixconf.sed that resulted in a prefix of "FcgidFcgid" on the
updated directives.

Submitted by: Dan Hulme <dhulme gmail.com>
Reviewed by: trawick

Modified:
    httpd/mod_fcgid/trunk/CHANGES-FCGID
    httpd/mod_fcgid/trunk/build/fixconf.sed

Modified: httpd/mod_fcgid/trunk/CHANGES-FCGID
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/CHANGES-FCGID?rev=827039&r1=827038&r2=827039&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] (original)
+++ httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] Tue Oct 20 11:40:35 2009
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with mod_fcgid 2.3.5
 
+  *) Fix a bug in fixconf.sed that resulted in a prefix of "FcgidFcgid" on the
+     updated directives.  [Dan Hulme <dhulme gmail.com>]
+
   *) Fix possible corruption or truncation of request bodies which exceed
      FcgidMaxRequestInMem.  This is a regression since mod_fcgid 2.2, which
      effectively ignored FcgidMaxRequestInMem if larger than 8K.  PR 48021.

Modified: httpd/mod_fcgid/trunk/build/fixconf.sed
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/build/fixconf.sed?rev=827039&r1=827038&r2=827039&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/build/fixconf.sed (original)
+++ httpd/mod_fcgid/trunk/build/fixconf.sed Tue Oct 20 11:40:35 2009
@@ -53,35 +53,35 @@
 s/^ZombieScanInterval/FcgidZombieScanInterval/g
 # Next we fix all other occurences without matching
 # the ones, that are already OK
-s/\([^D]\)BusyScanInterval/\1FcgidBusyScanInterval/g
-s/\([^D]\)BusyTimeout/\1FcgidBusyTimeout/g
-s/\([^D]\)DefaultInitEnv/\1FcgidInitialEnv/g
-s/\([^D]\)DefaultMaxClassProcessCount/\1FcgidMaxProcessesPerClass/g
-s/\([^D]\)DefaultMinClassProcessCount/\1FcgidMinProcessesPerClass/g
-s/\([^D]\)ErrorScanInterval/\1FcgidErrorScanInterval/g
-s/\([^D]\)FastCgiAccessChecker/\1FcgidAccessChecker/g
-s/\([^D]\)FastCgiAccessCheckerAuthoritative/\1FcgidAccessCheckerAuthoritative/g
-s/\([^D]\)FastCgiAuthenticator/\1FcgidAuthenticator/g
-s/\([^D]\)FastCgiAuthenticatorAuthoritative/\1FcgidAuthenticatorAuthoritative/g
-s/\([^D]\)FastCgiAuthorizer/\1FcgidAuthorizer/g
-s/\([^D]\)FastCgiAuthorizerAuthoritative/\1FcgidAuthorizerAuthoritative/g
-s/\([^D]\)FCGIWrapper/\1FcgidWrapper/g
-s/\([^D]\)IdleScanInterval/\1FcgidIdleScanInterval/g
-s/\([^D]\)IdleTimeout/\1FcgidIdleTimeout/g
-s/\([^D]\)IPCCommTimeout/\1FcgidIOTimeout/g
-s/\([^D]\)IPCConnectTimeout/\1FcgidConnectTimeout/g
-s/\([^D]\)MaxProcessCount/\1FcgidMaxProcesses/g
-s/\([^D]\)MaxRequestInMem/\1FcgidMaxRequestInMem/g
-s/\([^D]\)MaxRequestLen/\1FcgidMaxRequestLen/g
-s/\([^D]\)MaxRequestsPerProcess/\1FcgidMaxRequestsPerProcess/g
-s/\([^D]\)OutputBufferSize/\1FcgidOutputBufferSize/g
-s/\([^D]\)PassHeader/\1FcgidPassHeader/g
-s/\([^D]\)PHP_Fix_Pathinfo_Enable/\1FcgidFixPathinfo/g
-s/\([^D]\)ProcessLifeTime/\1FcgidProcessLifeTime/g
-s/\([^D]\)SharememPath/\1FcgidProcessTableFile/g
-s/\([^D]\)SocketPath/\1FcgidIPCDir/g
-s/\([^D]\)SpawnScore/\1FcgidSpawnScore/g
-s/\([^D]\)SpawnScoreUpLimit/\1FcgidSpawnScoreUpLimit/g
-s/\([^D]\)TerminationScore/\1FcgidTerminationScore/g
-s/\([^D]\)TimeScore/\1FcgidTimeScore/g
-s/\([^D]\)ZombieScanInterval/\1FcgidZombieScanInterval/g
+s/\([^d]\)BusyScanInterval/\1FcgidBusyScanInterval/g
+s/\([^d]\)BusyTimeout/\1FcgidBusyTimeout/g
+s/\([^d]\)DefaultInitEnv/\1FcgidInitialEnv/g
+s/\([^d]\)DefaultMaxClassProcessCount/\1FcgidMaxProcessesPerClass/g
+s/\([^d]\)DefaultMinClassProcessCount/\1FcgidMinProcessesPerClass/g
+s/\([^d]\)ErrorScanInterval/\1FcgidErrorScanInterval/g
+s/\([^d]\)FastCgiAccessChecker/\1FcgidAccessChecker/g
+s/\([^d]\)FastCgiAccessCheckerAuthoritative/\1FcgidAccessCheckerAuthoritative/g
+s/\([^d]\)FastCgiAuthenticator/\1FcgidAuthenticator/g
+s/\([^d]\)FastCgiAuthenticatorAuthoritative/\1FcgidAuthenticatorAuthoritative/g
+s/\([^d]\)FastCgiAuthorizer/\1FcgidAuthorizer/g
+s/\([^d]\)FastCgiAuthorizerAuthoritative/\1FcgidAuthorizerAuthoritative/g
+s/\([^d]\)FCGIWrapper/\1FcgidWrapper/g
+s/\([^d]\)IdleScanInterval/\1FcgidIdleScanInterval/g
+s/\([^d]\)IdleTimeout/\1FcgidIdleTimeout/g
+s/\([^d]\)IPCCommTimeout/\1FcgidIOTimeout/g
+s/\([^d]\)IPCConnectTimeout/\1FcgidConnectTimeout/g
+s/\([^d]\)MaxProcessCount/\1FcgidMaxProcesses/g
+s/\([^d]\)MaxRequestInMem/\1FcgidMaxRequestInMem/g
+s/\([^d]\)MaxRequestLen/\1FcgidMaxRequestLen/g
+s/\([^d]\)MaxRequestsPerProcess/\1FcgidMaxRequestsPerProcess/g
+s/\([^d]\)OutputBufferSize/\1FcgidOutputBufferSize/g
+s/\([^d]\)PassHeader/\1FcgidPassHeader/g
+s/\([^d]\)PHP_Fix_Pathinfo_Enable/\1FcgidFixPathinfo/g
+s/\([^d]\)ProcessLifeTime/\1FcgidProcessLifeTime/g
+s/\([^d]\)SharememPath/\1FcgidProcessTableFile/g
+s/\([^d]\)SocketPath/\1FcgidIPCDir/g
+s/\([^d]\)SpawnScore/\1FcgidSpawnScore/g
+s/\([^d]\)SpawnScoreUpLimit/\1FcgidSpawnScoreUpLimit/g
+s/\([^d]\)TerminationScore/\1FcgidTerminationScore/g
+s/\([^d]\)TimeScore/\1FcgidTimeScore/g
+s/\([^d]\)ZombieScanInterval/\1FcgidZombieScanInterval/g