rel 15; builds

[packages/apache1.git] / apache1-lingerd.patch

diff --git a/apache1-lingerd.patch b/apache1-lingerd.patch
index 86d4b57e46bdbb9610fb1b22e98d136f0cf46a88..d9235c36c24750adf462f9f2074309661628d97e 100644 (file)
--- a/apache1-lingerd.patch
+++ b/apache1-lingerd.patch
@@ -14,9 +14,10 @@
 #  instead of the regular apache-1.3/aplinger.diff.
 #
 
---- main/Makefile.tmpl.org     Sat Dec  2 16:09:32 2000
-+++ main/Makefile.tmpl Sat Dec  2 16:23:34 2000
-@@ -5,13 +5,13 @@
+diff -urNp -x '*.orig' apache_1.3.42.org/src/main/Makefile.tmpl apache_1.3.42/src/main/Makefile.tmpl
+--- apache_1.3.42.org/src/main/Makefile.tmpl   2004-11-24 20:10:19.000000000 +0100
++++ apache_1.3.42/src/main/Makefile.tmpl       2023-02-02 22:44:19.209834916 +0100
+@@ -5,13 +5,13 @@ INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXT
  LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  
  LIB=  libmain.a
@@ -32,18 +33,21 @@
  
  .c.o:
        $(CC) -c $(INCLUDES) $(CFLAGS) $<
---- main/http_main.c.org       Wed Feb 28 17:55:48 2001
-+++ main/http_main.c   Wed Feb 28 18:01:04 2001
-@@ -102,6 +102,8 @@
+diff -urNp -x '*.orig' apache_1.3.42.org/src/main/http_main.c apache_1.3.42/src/main/http_main.c
+--- apache_1.3.42.org/src/main/http_main.c     2023-02-02 22:44:18.889834915 +0100
++++ apache_1.3.42/src/main/http_main.c 2023-02-02 22:44:19.213168249 +0100
+@@ -60,6 +60,10 @@ int ap_main(int argc, char *argv[]);
  #include "http_vhost.h"
  #include "util_script.h"      /* to force util_script.c linking */
  #include "util_uri.h"
 +#define  IN_APACHE
 +#include "li_config.h"
++void lingerd_connect(void);
++int lingerd_sendfd(int);
  #include "scoreboard.h"
  #include "multithread.h"
  #include <sys/stat.h>
-@@ -1575,6 +1576,19 @@
+@@ -1993,6 +1997,19 @@ static void lingering_close(request_rec
        return;
      }
  
@@ -63,12 +67,12 @@
      /* Set up to wait for readable data on socket... */
  
      FD_ZERO(&lfds);
-@@ -3876,6 +3890,8 @@
-     ap_server_pre_read_config  = ap_make_array(pcommands, 1, sizeof(char *));
+@@ -4538,6 +4555,8 @@ static void common_init(void)
      ap_server_post_read_config = ap_make_array(pcommands, 1, sizeof(char *));
      ap_server_config_defines   = ap_make_array(pcommands, 1, sizeof(char *));
-+
-+    lingerd_connect();
  
++    lingerd_connect();
++
  #ifdef EAPI
      ap_hook_init();
+     ap_hook_configure("ap::buff::read",