SOURCES: apache1-ipv6-PLD.patch - rediff against apache_1.3.41
glen
glen at pld-linux.org
Mon Feb 16 18:32:42 CET 2009
Author: glen Date: Mon Feb 16 17:32:42 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- rediff against apache_1.3.41
---- Files affected:
SOURCES:
apache1-ipv6-PLD.patch (1.13 -> 1.14)
---- Diffs:
================================================================
Index: SOURCES/apache1-ipv6-PLD.patch
diff -u SOURCES/apache1-ipv6-PLD.patch:1.13 SOURCES/apache1-ipv6-PLD.patch:1.14
--- SOURCES/apache1-ipv6-PLD.patch:1.13 Mon Jul 17 13:49:23 2006
+++ SOURCES/apache1-ipv6-PLD.patch Mon Feb 16 18:32:36 2009
@@ -1,5 +1,25 @@
---- apache_1.3.28.orig/README.v6 Thu Jan 1 01:00:00 1970
-+++ apache_1.3.28/README.v6 Fri Jul 25 11:01:55 2003
+--- apache_1.3.41/conf/httpd.conf-dist 2004-11-24 21:10:19.000000000 +0200
++++ apache_1.3.41-ipv6/conf/httpd.conf-dist 2009-02-16 19:29:36.596835634 +0200
+@@ -174,6 +174,11 @@
+ #Listen 3000
+ #Listen 12.34.56.78:80
+
++# Listen can take two arguments.
++# (this is an extension for supporting IPv6 addresses)
++#Listen :: 80
++#Listen 0.0.0.0 80
++
+ #
+ # BindAddress: You can support virtual hosts with this option. This directive
+ # is used to tell the server which IP address to listen to. It can either
+--- apache_1.3.41/configure.v6 1970-01-01 03:00:00.000000000 +0300
++++ apache_1.3.41-ipv6/configure.v6 2009-02-16 19:29:36.600169885 +0200
+@@ -0,0 +1,3 @@
++#! /bin/sh
++
++./configure --enable-rule=INET6 --enable-module=proxy $*
+--- apache_1.3.41/README.v6 1970-01-01 03:00:00.000000000 +0300
++++ apache_1.3.41-ipv6/README.v6 2009-02-16 19:29:36.590170307 +0200
@@ -0,0 +1,166 @@
+IPv6-ready apache 1.3.x
+KAME Project
@@ -167,28 +187,86 @@
+ http://www.v6.linux.or.jp/
+ YOSHIFUJI Hideaki, USAGI Project
+ http://www.linux-ipv6.org/
---- apache_1.3.28.orig/conf/httpd.conf-dist Wed Jul 16 21:36:41 2003
-+++ apache_1.3.28/conf/httpd.conf-dist Fri Jul 25 11:01:55 2003
-@@ -174,6 +174,11 @@
- #Listen 3000
- #Listen 12.34.56.78:80
+--- apache_1.3.41/src/ap/ap_snprintf.c 2006-07-12 11:16:05.000000000 +0300
++++ apache_1.3.41-ipv6/src/ap/ap_snprintf.c 2009-02-16 19:29:36.603503089 +0200
+@@ -31,6 +31,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <math.h>
++#include "sa_len.h"
+ #ifdef WIN32
+ #include <float.h>
+ #endif
+@@ -468,6 +469,42 @@
-+# Listen can take two arguments.
-+# (this is an extension for supporting IPv6 addresses)
-+#Listen :: 80
-+#Listen 0.0.0.0 80
+
+
++#ifdef INET6
++static char *conv_sockaddr(struct sockaddr *sa, char *buf_end, int *len)
++{
++ char *p = buf_end;
++ char hostnamebuf[MAXHOSTNAMELEN];
++ char portnamebuf[MAXHOSTNAMELEN];
++ char *q;
++ int salen;
+
- #
- # BindAddress: You can support virtual hosts with this option. This directive
- # is used to tell the server which IP address to listen to. It can either
---- apache_1.3.28.orig/configure.v6 Thu Jan 1 01:00:00 1970
-+++ apache_1.3.28/configure.v6 Fri Jul 25 11:01:55 2003
-@@ -0,0 +1,3 @@
-+#! /bin/sh
++#ifndef SIN6_LEN
++ salen = SA_LEN(sa);
++#else
++ salen = sa->sa_len;
++#endif
++ if (getnameinfo(sa, salen, hostnamebuf, sizeof(hostnamebuf),
++ portnamebuf, sizeof(portnamebuf), NI_NUMERICHOST | NI_NUMERICSERV)) {
++ strcpy(hostnamebuf, "???");
++ strcpy(portnamebuf, "???");
++ }
++ if (strcmp(portnamebuf,"0") == 0)
++ strcpy(portnamebuf, "*");
++ q = portnamebuf + strlen(portnamebuf);
++ while (portnamebuf < q)
++ *--p = *--q;
++ *--p = ':';
++ q = hostnamebuf + strlen(hostnamebuf);
++ while (hostnamebuf < q)
++ *--p = *--q;
+
-+./configure --enable-rule=INET6 --enable-module=proxy $*
---- apache_1.3.28.orig/src/Configuration.tmpl Fri Jul 25 11:00:49 2003
-+++ apache_1.3.28/src/Configuration.tmpl Fri Jul 25 11:01:55 2003
++ *len = buf_end - p;
++ return (p);
++}
++#endif /*INET6*/
++
++
++
+ /*
+ * Convert a floating point number to a string formats 'f', 'e' or 'E'.
+ * The result is placed in buf, and len denotes the length of the string
+@@ -1015,6 +1052,7 @@
+ /* print a struct sockaddr_in as a.b.c.d:port */
+ case 'I':
+ {
++#ifndef INET6
+ struct sockaddr_in *si;
+
+ si = va_arg(ap, struct sockaddr_in *);
+@@ -1023,6 +1061,16 @@
+ if (adjust_precision && precision < s_len)
+ s_len = precision;
+ }
++#else
++ struct sockaddr *sa;
++
++ sa = va_arg(ap, struct sockaddr *);
++ if (sa != NULL) {
++ s = conv_sockaddr(sa, &num_buf[NUM_BUF_SIZE], &s_len);
++ if (adjust_precision && precision < s_len)
++ s_len = precision;
++ }
++#endif
+ else {
+ s = S_NULL;
+ s_len = S_NULL_LEN;
+--- apache_1.3.41/src/Configuration.tmpl 2009-02-16 19:29:13.454337891 +0200
++++ apache_1.3.41-ipv6/src/Configuration.tmpl 2009-02-16 19:29:36.600169885 +0200
@@ -191,6 +191,9 @@
# Rule EXPAT=default : If Expat can be found at the system or
# in lib/expat-lite, use it; otherwise
@@ -207,9 +285,9 @@
Rule CYGWIN_WINSOCK=no
# DEV_RANDOM:
---- apache_1.3.28.orig/src/Configure Fri Jul 25 11:00:49 2003
-+++ apache_1.3.28/src/Configure Fri Jul 25 11:01:55 2003
-@@ -238,6 +238,7 @@
+--- apache_1.3.41/src/Configure 2009-02-16 19:29:13.414338992 +0200
++++ apache_1.3.41-ipv6/src/Configure 2009-02-16 19:29:36.603503089 +0200
+@@ -195,6 +195,7 @@
RULE_CYGWIN_WINSOCK=`./helpers/CutRule CYGWIN_WINSOCK $file`
RULE_SHARED_CORE=`./helpers/CutRule SHARED_CORE $file`
RULE_SHARED_CHAIN=`./helpers/CutRule SHARED_CHAIN $file`
@@ -217,7 +295,7 @@
####################################################################
## Rule SHARED_CORE implies required DSO support
-@@ -1724,6 +1725,124 @@
+@@ -1692,6 +1693,124 @@
esac
fi
@@ -342,7 +420,7 @@
####################################################################
## Find out what modules we want and try and configure things for them
## Module lines can look like this:
-@@ -2320,6 +2439,38 @@
+@@ -2296,6 +2415,38 @@
echo "#define AP_LONGEST_LONG $AP_LONGEST_LONG" >>$AP_CONFIG_AUTO_H
echo "#endif" >>$AP_CONFIG_AUTO_H
@@ -381,99 +459,9 @@
####################################################################
## More building ap_config_auto.h
##
---- apache_1.3.28.orig/src/ap/ap_snprintf.c Mon Feb 3 18:13:17 2003
-+++ apache_1.3.28/src/ap/ap_snprintf.c Fri Jul 25 11:01:55 2003
-@@ -73,6 +73,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <math.h>
-+#include "sa_len.h"
- #ifdef WIN32
- #include <float.h>
- #endif
-@@ -510,6 +511,42 @@
-
-
-
-+#ifdef INET6
-+static char *conv_sockaddr(struct sockaddr *sa, char *buf_end, int *len)
-+{
-+ char *p = buf_end;
-+ char hostnamebuf[MAXHOSTNAMELEN];
-+ char portnamebuf[MAXHOSTNAMELEN];
-+ char *q;
-+ int salen;
-+
-+#ifndef SIN6_LEN
-+ salen = SA_LEN(sa);
-+#else
-+ salen = sa->sa_len;
-+#endif
-+ if (getnameinfo(sa, salen, hostnamebuf, sizeof(hostnamebuf),
-+ portnamebuf, sizeof(portnamebuf), NI_NUMERICHOST | NI_NUMERICSERV)) {
-+ strcpy(hostnamebuf, "???");
-+ strcpy(portnamebuf, "???");
-+ }
-+ if (strcmp(portnamebuf,"0") == 0)
-+ strcpy(portnamebuf, "*");
-+ q = portnamebuf + strlen(portnamebuf);
-+ while (portnamebuf < q)
-+ *--p = *--q;
-+ *--p = ':';
-+ q = hostnamebuf + strlen(hostnamebuf);
-+ while (hostnamebuf < q)
-+ *--p = *--q;
-+
-+ *len = buf_end - p;
-+ return (p);
-+}
-+#endif /*INET6*/
-+
-+
-+
- /*
- * Convert a floating point number to a string formats 'f', 'e' or 'E'.
- * The result is placed in buf, and len denotes the length of the string
-@@ -1057,6 +1094,7 @@
- /* print a struct sockaddr_in as a.b.c.d:port */
- case 'I':
- {
-+#ifndef INET6
- struct sockaddr_in *si;
-
- si = va_arg(ap, struct sockaddr_in *);
-@@ -1065,6 +1103,16 @@
- if (adjust_precision && precision < s_len)
- s_len = precision;
- }
-+#else
-+ struct sockaddr *sa;
-+
-+ sa = va_arg(ap, struct sockaddr *);
-+ if (sa != NULL) {
-+ s = conv_sockaddr(sa, &num_buf[NUM_BUF_SIZE], &s_len);
-+ if (adjust_precision && precision < s_len)
-+ s_len = precision;
-+ }
-+#endif
- else {
- s = S_NULL;
- s_len = S_NULL_LEN;
---- apache_1.3.28.orig/src/include/ap.h Mon Feb 3 18:13:17 2003
-+++ apache_1.3.28/src/include/ap.h Fri Jul 25 11:01:55 2003
-@@ -95,7 +95,8 @@
- * with some extensions. The extensions are:
- *
- * %pA takes a struct in_addr *, and prints it as a.b.c.d
-- * %pI takes a struct sockaddr_in * and prints it as a.b.c.d:port
-+ * %pI takes a struct sockaddr * and prints it as a.b.c.d:port, or
-+ * ipv6-numeric-addr:port
- * %pp takes a void * and outputs it in hex
- *
- * The %p hacks are to force gcc's printf warning code to skip
---- apache_1.3.28.orig/src/include/ap_config.h Mon May 5 13:45:49 2003
-+++ apache_1.3.28/src/include/ap_config.h Fri Jul 25 11:01:55 2003
-@@ -411,6 +411,10 @@
+--- apache_1.3.41/src/include/ap_config.h 2006-07-12 11:16:05.000000000 +0300
++++ apache_1.3.41-ipv6/src/include/ap_config.h 2009-02-16 19:29:36.603503089 +0200
+@@ -375,6 +375,10 @@
#endif
#ifndef S_IWOTH
#define S_IWOTH 000002
@@ -484,7 +472,7 @@
#endif
#define STDIN_FILENO 0
-@@ -1523,6 +1527,70 @@
+@@ -1455,6 +1459,70 @@
#define ap_wait_t int
#endif
@@ -555,9 +543,21 @@
#ifdef __cplusplus
}
#endif
---- apache_1.3.28.orig/src/include/http_conf_globals.h Fri Jul 25 11:00:49 2003
-+++ apache_1.3.28/src/include/http_conf_globals.h Fri Jul 25 11:01:55 2003
-@@ -82,7 +82,8 @@
+--- apache_1.3.41/src/include/ap.h 2006-07-12 11:16:05.000000000 +0300
++++ apache_1.3.41-ipv6/src/include/ap.h 2009-02-16 19:29:36.603503089 +0200
+@@ -53,7 +53,8 @@
+ * with some extensions. The extensions are:
+ *
+ * %pA takes a struct in_addr *, and prints it as a.b.c.d
+- * %pI takes a struct sockaddr_in * and prints it as a.b.c.d:port
++ * %pI takes a struct sockaddr * and prints it as a.b.c.d:port, or
++ * ipv6-numeric-addr:port
+ * %pp takes a void * and outputs it in hex
+ *
+ * The %p hacks are to force gcc's printf warning code to skip
+--- apache_1.3.41/src/include/http_conf_globals.h 2009-02-16 19:29:13.421004229 +0200
++++ apache_1.3.41-ipv6/src/include/http_conf_globals.h 2009-02-16 19:29:36.606835974 +0200
+@@ -40,7 +40,8 @@
extern API_VAR_EXPORT int ap_max_requests_per_child;
extern API_VAR_EXPORT int ap_threads_per_child;
extern API_VAR_EXPORT int ap_excess_requests_per_child;
@@ -567,20 +567,9 @@
extern listen_rec *ap_listeners;
extern API_VAR_EXPORT int ap_daemons_to_start;
extern API_VAR_EXPORT int ap_daemons_min_free;
---- apache_1.3.28.orig/src/include/http_vhost.h Mon Feb 3 18:13:19 2003
-+++ apache_1.3.28/src/include/http_vhost.h Fri Jul 25 11:01:55 2003
-@@ -73,7 +73,7 @@
- API_EXPORT(const char *) ap_parse_vhost_addrs(pool *p, const char *hostname, server_rec *s);
-
- /* handle NameVirtualHost directive */
--API_EXPORT_NONSTD(const char *) ap_set_name_virtual_host (cmd_parms *cmd, void *dummy, char *arg);
-+API_EXPORT_NONSTD(const char *) ap_set_name_virtual_host (cmd_parms *cmd, void *dummy, char *h, char *p);
-
- /* given an ip address only, give our best guess as to what vhost it is */
- API_EXPORT(void) ap_update_vhost_given_ip(conn_rec *conn);
---- apache_1.3.28.orig/src/include/httpd.h Fri Jul 25 11:00:49 2003
-+++ apache_1.3.28/src/include/httpd.h Fri Jul 25 11:01:55 2003
-@@ -904,8 +904,8 @@
+--- apache_1.3.41/src/include/httpd.h 2009-02-16 19:29:13.454337891 +0200
++++ apache_1.3.41-ipv6/src/include/httpd.h 2009-02-16 19:29:36.606835974 +0200
+@@ -865,8 +865,8 @@
/* Who is the client? */
@@ -591,7 +580,7 @@
char *remote_ip; /* Client's IP address */
char *remote_host; /* Client's DNS name, if known.
* NULL if DNS hasn't been checked,
-@@ -947,8 +947,8 @@
+@@ -908,8 +908,8 @@
typedef struct server_addr_rec server_addr_rec;
struct server_addr_rec {
server_addr_rec *next;
@@ -602,7 +591,7 @@
char *virthost; /* The name given in <VirtualHost> */
};
-@@ -1016,7 +1016,7 @@
+@@ -977,7 +977,7 @@
/* These are more like real hosts than virtual hosts */
struct listen_rec {
listen_rec *next;
@@ -611,7 +600,7 @@
int fd;
int used; /* Only used during restart */
/* more stuff here, like which protocol is bound to the port */
-@@ -1184,7 +1184,7 @@
+@@ -1147,7 +1147,7 @@
#endif /*#ifdef CHARSET_EBCDIC*/
API_EXPORT(char *) ap_get_local_host(pool *);
@@ -620,8 +609,19 @@
extern API_VAR_EXPORT time_t ap_restart_time;
---- apache_1.3.28.orig/src/include/sa_len.h Thu Jan 1 01:00:00 1970
-+++ apache_1.3.28/src/include/sa_len.h Fri Jul 25 11:01:55 2003
+--- apache_1.3.41/src/include/http_vhost.h 2006-07-12 11:16:05.000000000 +0300
++++ apache_1.3.41-ipv6/src/include/http_vhost.h 2009-02-16 19:29:36.606835974 +0200
+@@ -31,7 +31,7 @@
+ API_EXPORT(const char *) ap_parse_vhost_addrs(pool *p, const char *hostname, server_rec *s);
+
+ /* handle NameVirtualHost directive */
+-API_EXPORT_NONSTD(const char *) ap_set_name_virtual_host (cmd_parms *cmd, void *dummy, char *arg);
++API_EXPORT_NONSTD(const char *) ap_set_name_virtual_host (cmd_parms *cmd, void *dummy, char *h, char *p);
+
+ /* given an ip address only, give our best guess as to what vhost it is */
+ API_EXPORT(void) ap_update_vhost_given_ip(conn_rec *conn);
+--- apache_1.3.41/src/include/sa_len.h 1970-01-01 03:00:00.000000000 +0300
++++ apache_1.3.41-ipv6/src/include/sa_len.h 2009-02-16 19:29:36.606835974 +0200
@@ -0,0 +1,41 @@
+/* sa_len.h : tiny version of SA_LEN (written by <yoshfuji at ecei.tohoku.ac.jp>) */
+
@@ -664,8 +664,8 @@
+}
+#endif /* SA_LEN */
+#endif /* HAVE_SOCKADDR_LEN */
---- apache_1.3.28.orig/src/include/sockaddr_storage.h Thu Jan 1 01:00:00 1970
-+++ apache_1.3.28/src/include/sockaddr_storage.h Fri Jul 25 11:01:55 2003
+--- apache_1.3.41/src/include/sockaddr_storage.h 1970-01-01 03:00:00.000000000 +0300
++++ apache_1.3.41-ipv6/src/include/sockaddr_storage.h 2009-02-16 19:29:36.606835974 +0200
@@ -0,0 +1,53 @@
+/*
+struct sockaddr_storage
@@ -720,8 +720,8 @@
+#define su_port su_si.si_port
+
+#endif /* NEED_SOCKADDR_STORAGE */
---- apache_1.3.28.orig/src/main/getaddrinfo.c Thu Jan 1 01:00:00 1970
-+++ apache_1.3.28/src/main/getaddrinfo.c Fri Jul 25 11:01:55 2003
+--- apache_1.3.41/src/main/getaddrinfo.c 1970-01-01 03:00:00.000000000 +0300
++++ apache_1.3.41-ipv6/src/main/getaddrinfo.c 2009-02-16 19:29:36.606835974 +0200
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@@ -885,8 +885,8 @@
+ }
+ return EAI_NODATA;
+}
---- apache_1.3.28.orig/src/main/getnameinfo.c Thu Jan 1 01:00:00 1970
-+++ apache_1.3.28/src/main/getnameinfo.c Fri Jul 25 11:01:55 2003
+--- apache_1.3.41/src/main/getnameinfo.c 1970-01-01 03:00:00.000000000 +0300
++++ apache_1.3.41-ipv6/src/main/getnameinfo.c 2009-02-16 19:29:36.610169965 +0200
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@@ -983,9 +983,9 @@
+ return EAI_NODATA;
+ return 0;
+}
---- apache_1.3.28.orig/src/main/http_config.c Fri Jul 25 11:00:49 2003
-+++ apache_1.3.28/src/main/http_config.c Fri Jul 25 11:01:55 2003
-@@ -1591,7 +1591,6 @@
+--- apache_1.3.41/src/main/http_config.c 2009-02-16 19:29:13.427670844 +0200
++++ apache_1.3.41-ipv6/src/main/http_config.c 2009-02-16 19:29:36.610169965 +0200
+@@ -1553,7 +1553,6 @@
ap_scoreboard_fname = DEFAULT_SCOREBOARD;
ap_lock_fname = DEFAULT_LOCKFILE;
ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;
@@ -993,7 +993,7 @@
ap_listeners = NULL;
ap_listenbacklog = DEFAULT_LISTENBACKLOG;
ap_extended_status = 0;
-@@ -1624,7 +1623,13 @@
+@@ -1586,7 +1585,13 @@
s->next = NULL;
s->addrs = ap_pcalloc(p, sizeof(server_addr_rec));
/* NOT virtual host; don't match any real network interface */
@@ -1008,7 +1008,7 @@
s->addrs->host_port = 0; /* matches any port */
s->addrs->virthost = ""; /* must be non-NULL */
s->names = s->wild_names = NULL;
-@@ -1643,21 +1648,33 @@
+@@ -1605,21 +1610,33 @@
static void default_listeners(pool *p, server_rec *s)
{
listen_rec *new;
@@ -1047,9 +1047,9 @@
}
---- apache_1.3.34/src/main/http_core.c.orig 2005-06-28 20:03:25.000000000 +0200
-+++ apache_1.3.34/src/main/http_core.c 2005-10-18 10:14:09.000000000 +0200
-@@ -28,6 +28,7 @@
+--- apache_1.3.41/src/main/http_core.c 2006-07-12 11:16:05.000000000 +0300
++++ apache_1.3.41-ipv6/src/main/http_core.c 2009-02-16 19:29:36.613502634 +0200
+@@ -29,6 +29,7 @@
#include "util_md5.h"
#include "scoreboard.h"
#include "fnmatch.h"
@@ -1057,7 +1057,7 @@
#ifdef USE_MMAP_FILES
#include <sys/mman.h>
-@@ -570,7 +571,7 @@
+@@ -571,7 +572,7 @@
* file if you care. So the adhoc value should do.
*/
return ap_psprintf(r->pool,"%pA%pp%pp%pp%pp",
@@ -1066,7 +1066,7 @@
(void *)ap_user_name,
(void *)ap_listeners,
(void *)ap_server_argv0,
-@@ -666,7 +667,9 @@
+@@ -667,7 +668,9 @@
*/
static ap_inline void do_double_reverse (conn_rec *conn)
{
@@ -1077,7 +1077,7 @@
if (conn->double_reverse) {
/* already done */
-@@ -678,30 +681,54 @@
+@@ -679,30 +682,54 @@
conn->remote_host = ""; /* prevent another lookup */
return;
}
@@ -1146,7 +1146,7 @@
/* If we haven't checked the host name, and we want to */
if (dir_config) {
-@@ -723,10 +750,14 @@
+@@ -724,10 +751,14 @@
|| hostname_lookups != HOSTNAME_LOOKUP_OFF)) {
old_stat = ap_update_child_status(conn->child_num, SERVER_BUSY_DNS,
(request_rec*)NULL);
@@ -1165,7 +1165,7 @@
ap_str_tolower(conn->remote_host);
if (hostname_lookups == HOSTNAME_LOOKUP_DOUBLE) {
-@@ -804,6 +835,7 @@
+@@ -805,6 +836,7 @@
{
conn_rec *conn = r->connection;
core_dir_config *d;
@@ -1173,7 +1173,7 @@
d = (core_dir_config *)ap_get_module_config(r->per_dir_config,
&core_module);
-@@ -813,23 +845,22 @@
+@@ -814,23 +846,22 @@
}
if (d->use_canonical_name == USE_CANONICAL_NAME_DNS) {
if (conn->local_host == NULL) {
@@ -1209,7 +1209,7 @@
(void) ap_update_child_status(conn->child_num, old_stat, r);
}
return conn->local_host;
-@@ -841,7 +872,7 @@
+@@ -842,7 +873,7 @@
API_EXPORT(unsigned) ap_get_server_port(const request_rec *r)
{
unsigned port;
@@ -1218,7 +1218,7 @@
core_dir_config *d =
(core_dir_config *)ap_get_module_config(r->per_dir_config, &core_module);
-@@ -2647,12 +2678,25 @@
+@@ -2648,12 +2679,25 @@
static const char *set_bind_address(cmd_parms *cmd, void *dummy, char *arg)
{
@@ -1245,7 +1245,7 @@
return NULL;
}
-@@ -2684,48 +2728,71 @@
+@@ -2685,48 +2729,71 @@
return NULL;
}
@@ -1347,7 +1347,7 @@
new->fd = -1;
new->used = 0;
new->next = ap_listeners;
-@@ -3650,7 +3717,7 @@
+@@ -3651,7 +3718,7 @@
{ "ThreadStackSize", set_threadstacksize, NULL, RSRC_CONF, TAKE1,
"Stack size each created thread will use."},
#endif
@@ -1356,7 +1356,7 @@
"A port number or a numeric IP address and a port number"},
{ "SendBufferSize", set_send_buffer_size, NULL, RSRC_CONF, TAKE1,
"Send buffer size in bytes"},
-@@ -3684,7 +3751,7 @@
+@@ -3685,7 +3752,7 @@
"Name of the config file to be included" },
{ "LogLevel", set_loglevel, NULL, RSRC_CONF, TAKE1,
"Level of verbosity in error logging" },
@@ -1365,10 +1365,10 @@
"A numeric IP address:port, or the name of a host" },
#ifdef _OSD_POSIX
{ "BS2000Account", set_bs2000_account, NULL, RSRC_CONF, TAKE1,
---- apache_1.3.28.orig/src/main/http_main.c Fri Jul 25 11:00:49 2003
-+++ apache_1.3.28/src/main/http_main.c Fri Jul 25 12:13:12 2003
-@@ -124,6 +124,8 @@
- #include <bstring.h> /* for IRIX, FD_SET calls bzero() */
+--- apache_1.3.41/src/main/http_main.c 2009-02-16 19:29:13.431004203 +0200
++++ apache_1.3.41-ipv6/src/main/http_main.c 2009-02-16 19:29:36.620170407 +0200
+@@ -85,6 +85,8 @@
+ #include <sys/prctl.h>
#endif
+#include "sa_len.h"
@@ -1376,7 +1376,7 @@
#ifdef MULTITHREAD
/* special debug stuff -- PCS */
-@@ -249,7 +251,12 @@
+@@ -210,7 +212,12 @@
API_VAR_EXPORT char *ap_scoreboard_fname=NULL;
API_VAR_EXPORT char *ap_lock_fname=NULL;
API_VAR_EXPORT char *ap_server_argv0=NULL;
@@ -1390,7 +1390,7 @@
API_VAR_EXPORT int ap_daemons_to_start=0;
API_VAR_EXPORT int ap_daemons_min_free=0;
API_VAR_EXPORT int ap_daemons_max_free=0;
-@@ -1448,7 +1455,11 @@
+@@ -1461,7 +1468,11 @@
fprintf(stderr, "Usage: %s [-D name] [-d directory] [-f file]\n", bin);
#endif
fprintf(stderr, " %s [-C \"directive\"] [-c \"directive\"]\n", pad);
@@ -1403,7 +1403,7 @@
fprintf(stderr, "Options:\n");
#ifdef SHARED_CORE
fprintf(stderr, " -R directory : specify an alternate location for shared object files\n");
-@@ -1474,6 +1485,10 @@
+@@ -1487,6 +1498,10 @@
#ifndef WIN32
fprintf(stderr, " -F : run main process in foreground, for process supervisors\n");
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/apache1-ipv6-PLD.patch?r1=1.13&r2=1.14&f=u
More information about the pld-cvs-commit
mailing list