- mv ../BUILD/apache_1.3.39/_lingerd/apache-1.3/aplinger-ssl.diff (lingerd 0.94)

Changed files:
    apache1-lingerd.patch -> 1.1

diff --git a/apache1-lingerd.patch b/apache1-lingerd.patch
new file mode 100644 (file)
index 0000000..86d4b57
--- /dev/null
+++ b/apache1-lingerd.patch
@@ -0,0 +1,74 @@
+
+# This is a patch to make lingerd work with Apache and mod_ssl together.
+#
+# Installation instructions:
+#
+#  1) untar apache, mod_ssl and lingerd
+#
+#  2) install mod_ssl, per the instructions in mod_ssl_2.x/INSTALL,
+#  using "the flexible APACI-only way", which copies files over into
+#  apache's source tree, but doesn't compile Apache just yet.
+#
+#  3) install lingerd per the instructions in lingerd-0.9x/INSTALL.
+#  when patching the Apache source, use aplinger-ssl.diff (this file)
+#  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 @@
+ LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
+ 
+ LIB=  libmain.a
+-HEADERS= test_char.h uri_delims.h 
++HEADERS= test_char.h uri_delims.h li_config.h
+ 
+ OBJS= alloc.o buff.o \
+       http_config.o http_core.o http_log.o \
+       http_main.o http_protocol.o http_request.o http_vhost.o \
+       util.o util_date.o util_script.o util_uri.o util_md5.o \
+-      rfc1413.o
++      rfc1413.o ap_lingerd.o
+ 
+ .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 @@
+ #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"
+ #include "scoreboard.h"
+ #include "multithread.h"
+ #include <sys/stat.h>
+@@ -1575,6 +1576,19 @@
+       return;
+     }
+ 
++    /* 
++     * Try to feed the socket to the linger daemon.  If it fails and
++     * we're configured to do so, do a lingering close anyway.
++     * Otherwise just close the socket; lingerd will linger on its copy
++     * of it.
++     */
++
++    if (lingerd_sendfd(lsd) == 0 || !(LINGER_ON_FAILURE)) {
++      ap_bclose(r->connection->client);
++      ap_kill_timeout(r);
++      return;
++    }
++
+     /* 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 *));
+     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();
+ 
+ #ifdef EAPI
+     ap_hook_init();