[Apachetoolbox-commit] Apachetoolbox CHANGE,1.7,1.8 install.sh,1.8,1.9

[Kevin J. M. Jr. <nir...@us...>]

Update of /cvsroot/apachetoolbox/Apachetoolbox
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10165

Modified Files:
	CHANGE install.sh 
Log Message:
Added a patch for the Apache source code to fix a bug that is messing up some modules.  Fix for MySQL script bug.


Index: CHANGE
===================================================================
RCS file: /cvsroot/apachetoolbox/Apachetoolbox/CHANGE,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CHANGE	12 Aug 2004 14:03:51 -0000	1.7
--- CHANGE	5 Oct 2004 18:38:42 -0000	1.8
***************
*** 1,2 ****
--- 1,8 ----
+ v1.5.72		
+ 		Patched Apache to work with some third party mods (e.g., 
+ 		mod_dav & frontpage extensions) correctly.  Many version 
+ 		updates in general.  Fixed a bug with the MySQL install 
+ 		script.
+ 
  v1.5.71		08/12/04
  		Updated Apache httpd to v1.3.31 as well as mod_ssl.  Many other

Index: install.sh
===================================================================
RCS file: /cvsroot/apachetoolbox/Apachetoolbox/install.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** install.sh	12 Aug 2004 13:50:43 -0000	1.8
--- install.sh	5 Oct 2004 18:38:42 -0000	1.9
***************
*** 166,170 ****
  echo_line
  comp_menu_item 1 "$INSTALL_GD" "GD $GD" TAB;TAB;TAB; comp_menu_item 2 "$FALSE" "-SQL DB Menus-\n"
! comp_menu_item 3 "$INSTALL_MODPYTHON" "Mod Python $MODPYTHON" TAB;TAB;TAB; comp_menu_item 4 "$INSTALL_SSL" "Mod_SSL+OpenSSL\n"
  comp_menu_item 5 "$INSTALL_MODTHROTTLE" "-Mod Throttle $THROTTLE"; TAB; comp_menu_item 6 "$INSTALL_WEBDAV" "-WebDAV $WEBDAV$n";
  comp_menu_item 7 "$INSTALL_MODFASTCGI" "-Mod FastCGI"; TAB;TAB; comp_menu_item 8 "$INSTALL_MODAUTHNDS" "-Mod AuthNDS $MODAUTHNDS$n";
--- 166,170 ----
  echo_line
  comp_menu_item 1 "$INSTALL_GD" "GD $GD" TAB;TAB;TAB; comp_menu_item 2 "$FALSE" "-SQL DB Menus-\n"
! comp_menu_item 3 "$INSTALL_MODPYTHON" "Mod Python $MODPYTHON" TAB;TAB; comp_menu_item 4 "$INSTALL_SSL" "Mod_SSL+OpenSSL\n"
  comp_menu_item 5 "$INSTALL_MODTHROTTLE" "-Mod Throttle $THROTTLE"; TAB; comp_menu_item 6 "$INSTALL_WEBDAV" "-WebDAV $WEBDAV$n";
  comp_menu_item 7 "$INSTALL_MODFASTCGI" "-Mod FastCGI"; TAB;TAB; comp_menu_item 8 "$INSTALL_MODAUTHNDS" "-Mod AuthNDS $MODAUTHNDS$n";
***************
*** 468,472 ****
  else 
   cd $root/src
!  check_source "apache_$APACHE.tar.gz" "http://ftp.epix.net/apache/httpd/apache_$APACHE.tar.gz"
   explode apache_$APACHE.tar.gz
   $MV -f $root/src/apache_$APACHE $root/apache_$APACHE >/dev/null
--- 468,472 ----
  else 
   cd $root/src
!  check_source "apache_$APACHE.tar.gz" "http://apache.mirrors.pair.com/httpd/apache_$APACHE.tar.gz"
   explode apache_$APACHE.tar.gz
   $MV -f $root/src/apache_$APACHE $root/apache_$APACHE >/dev/null
***************
*** 488,491 ****
--- 488,499 ----
  
  
+ # Integrate a patch that should fix a few modules (mod_dav and frontpage extensions at least) in 1.3.31.  Hopefully this will be fixed in later releases and can be removed from ATB.
+ 
+ notice "$MENUTRUE" " Patching Apache source to fix a bug that affects several modules.\n"
+ $SED -e "s|r->connection->keepalive > 0|r->connection->keepalive != -1|" < $root/apache_$APACHE/src/main/http_request.c > $root/apache_$APACHE/src/main/http_request.c.tmp
+ $MV $root/apache_$APACHE/src/main/http_request.c.tmp $root/apache_$APACHE/src/main/http_request.c
+ 
+ 
+ 
  #	preconfigure apache, this is needed by SSL and a few others
  
***************
*** 509,514 ****
  #	to it.  we add modules from here on.
  
- 
- 
  #---------------------------------- Default Apache Mods ---------------------------------------
  
--- 517,520 ----