diff -Nur apache_1.3.22.orig/README.v6 apache_1.3.22/README.v6
--- apache_1.3.22.orig/README.v6 Thu Jan 1 01:00:00 1970
-+++ apache_1.3.22/README.v6 Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/README.v6 Tue Dec 18 23:14:29 2001
@@ -0,0 +1,166 @@
+IPv6-ready apache 1.3.x
+KAME Project
+ http://www.linux-ipv6.org/
diff -Nur apache_1.3.22.orig/conf/httpd.conf-dist apache_1.3.22/conf/httpd.conf-dist
--- apache_1.3.22.orig/conf/httpd.conf-dist Sat Oct 6 05:40:04 2001
-+++ apache_1.3.22/conf/httpd.conf-dist Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/conf/httpd.conf-dist Tue Dec 18 23:14:29 2001
@@ -174,6 +174,11 @@
#Listen 3000
#Listen 12.34.56.78:80
# is used to tell the server which IP address to listen to. It can either
diff -Nur apache_1.3.22.orig/configure.v6 apache_1.3.22/configure.v6
--- apache_1.3.22.orig/configure.v6 Thu Jan 1 01:00:00 1970
-+++ apache_1.3.22/configure.v6 Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/configure.v6 Tue Dec 18 23:14:29 2001
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+./configure --enable-rule=INET6 --enable-module=proxy $*
diff -Nur apache_1.3.22.orig/src/Configuration.tmpl apache_1.3.22/src/Configuration.tmpl
---- apache_1.3.22.orig/src/Configuration.tmpl Fri Dec 7 17:26:57 2001
-+++ apache_1.3.22/src/Configuration.tmpl Fri Dec 7 17:27:28 2001
+--- apache_1.3.22.orig/src/Configuration.tmpl Tue Dec 18 23:14:14 2001
++++ apache_1.3.22/src/Configuration.tmpl Tue Dec 18 23:14:29 2001
@@ -191,6 +191,9 @@
# Rule EXPAT=default : If Expat can be found at the system or
# in lib/expat-lite, use it; otherwise
# DEV_RANDOM:
# Note: this rule is only used when compiling mod_auth_digest.
diff -Nur apache_1.3.22.orig/src/Configure apache_1.3.22/src/Configure
---- apache_1.3.22.orig/src/Configure Fri Dec 7 17:26:57 2001
-+++ apache_1.3.22/src/Configure Fri Dec 7 17:27:28 2001
+--- apache_1.3.22.orig/src/Configure Tue Dec 18 23:14:13 2001
++++ apache_1.3.22/src/Configure Tue Dec 18 23:14:29 2001
@@ -237,6 +237,7 @@
RULE_EXPAT=`./helpers/CutRule EXPAT $file`
RULE_SHARED_CORE=`./helpers/CutRule SHARED_CORE $file`
##
diff -Nur apache_1.3.22.orig/src/ap/ap_snprintf.c apache_1.3.22/src/ap/ap_snprintf.c
--- apache_1.3.22.orig/src/ap/ap_snprintf.c Thu May 10 16:04:22 2001
-+++ apache_1.3.22/src/ap/ap_snprintf.c Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/ap/ap_snprintf.c Tue Dec 18 23:14:29 2001
@@ -73,6 +73,7 @@
#include <string.h>
#include <stdlib.h>
s_len = S_NULL_LEN;
diff -Nur apache_1.3.22.orig/src/ap/ap_snprintf.c~ apache_1.3.22/src/ap/ap_snprintf.c~
--- apache_1.3.22.orig/src/ap/ap_snprintf.c~ Thu Jan 1 01:00:00 1970
-+++ apache_1.3.22/src/ap/ap_snprintf.c~ Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/ap/ap_snprintf.c~ Tue Dec 18 23:14:29 2001
@@ -0,0 +1,1256 @@
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+}
diff -Nur apache_1.3.22.orig/src/include/ap.h apache_1.3.22/src/include/ap.h
--- apache_1.3.22.orig/src/include/ap.h Mon Jan 15 18:04:22 2001
-+++ apache_1.3.22/src/include/ap.h Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/include/ap.h Tue Dec 18 23:14:29 2001
@@ -91,7 +91,8 @@
* with some extensions. The extensions are:
*
* The %p hacks are to force gcc's printf warning code to skip
diff -Nur apache_1.3.22.orig/src/include/ap_config.h apache_1.3.22/src/include/ap_config.h
--- apache_1.3.22.orig/src/include/ap_config.h Mon Oct 8 17:49:33 2001
-+++ apache_1.3.22/src/include/ap_config.h Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/include/ap_config.h Tue Dec 18 23:14:29 2001
@@ -405,6 +405,10 @@
#endif
#ifndef S_IWOTH
}
#endif
diff -Nur apache_1.3.22.orig/src/include/http_conf_globals.h apache_1.3.22/src/include/http_conf_globals.h
---- apache_1.3.22.orig/src/include/http_conf_globals.h Fri Dec 7 17:26:57 2001
-+++ apache_1.3.22/src/include/http_conf_globals.h Fri Dec 7 17:27:28 2001
+--- apache_1.3.22.orig/src/include/http_conf_globals.h Tue Dec 18 23:14:13 2001
++++ apache_1.3.22/src/include/http_conf_globals.h Tue Dec 18 23:14:29 2001
@@ -82,7 +82,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_daemons_min_free;
diff -Nur apache_1.3.22.orig/src/include/http_vhost.h apache_1.3.22/src/include/http_vhost.h
--- apache_1.3.22.orig/src/include/http_vhost.h Mon Jan 15 18:04:37 2001
-+++ apache_1.3.22/src/include/http_vhost.h Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/include/http_vhost.h Tue Dec 18 23:14:29 2001
@@ -73,7 +73,7 @@
const char *ap_parse_vhost_addrs(pool *p, const char *hostname, server_rec *s);
/* given an ip address only, give our best guess as to what vhost it is */
void ap_update_vhost_given_ip(conn_rec *conn);
diff -Nur apache_1.3.22.orig/src/include/httpd.h apache_1.3.22/src/include/httpd.h
---- apache_1.3.22.orig/src/include/httpd.h Fri Dec 7 17:26:57 2001
-+++ apache_1.3.22/src/include/httpd.h Fri Dec 7 17:27:28 2001
+--- apache_1.3.22.orig/src/include/httpd.h Tue Dec 18 23:14:14 2001
++++ apache_1.3.22/src/include/httpd.h Tue Dec 18 23:14:29 2001
@@ -912,8 +912,8 @@
/* Who is the client? */
diff -Nur apache_1.3.22.orig/src/include/sa_len.h apache_1.3.22/src/include/sa_len.h
--- apache_1.3.22.orig/src/include/sa_len.h Thu Jan 1 01:00:00 1970
-+++ apache_1.3.22/src/include/sa_len.h Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/include/sa_len.h Tue Dec 18 23:14:29 2001
@@ -0,0 +1,41 @@
+/* sa_len.h : tiny version of SA_LEN (written by <yoshfuji@ecei.tohoku.ac.jp>) */
+
+#endif /* HAVE_SOCKADDR_LEN */
diff -Nur apache_1.3.22.orig/src/include/sockaddr_storage.h apache_1.3.22/src/include/sockaddr_storage.h
--- apache_1.3.22.orig/src/include/sockaddr_storage.h Thu Jan 1 01:00:00 1970
-+++ apache_1.3.22/src/include/sockaddr_storage.h Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/include/sockaddr_storage.h Tue Dec 18 23:14:29 2001
@@ -0,0 +1,53 @@
+/*
+struct sockaddr_storage
+#endif /* NEED_SOCKADDR_STORAGE */
diff -Nur apache_1.3.22.orig/src/main/getaddrinfo.c apache_1.3.22/src/main/getaddrinfo.c
--- apache_1.3.22.orig/src/main/getaddrinfo.c Thu Jan 1 01:00:00 1970
-+++ apache_1.3.22/src/main/getaddrinfo.c Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/main/getaddrinfo.c Tue Dec 18 23:14:29 2001
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
+}
diff -Nur apache_1.3.22.orig/src/main/getnameinfo.c apache_1.3.22/src/main/getnameinfo.c
--- apache_1.3.22.orig/src/main/getnameinfo.c Thu Jan 1 01:00:00 1970
-+++ apache_1.3.22/src/main/getnameinfo.c Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/main/getnameinfo.c Tue Dec 18 23:14:29 2001
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
+ return 0;
+}
diff -Nur apache_1.3.22.orig/src/main/http_config.c apache_1.3.22/src/main/http_config.c
---- apache_1.3.22.orig/src/main/http_config.c Fri Dec 7 17:26:57 2001
-+++ apache_1.3.22/src/main/http_config.c Fri Dec 7 17:27:28 2001
+--- apache_1.3.22.orig/src/main/http_config.c Tue Dec 18 23:14:13 2001
++++ apache_1.3.22/src/main/http_config.c Tue Dec 18 23:14:29 2001
@@ -1564,7 +1564,6 @@
ap_scoreboard_fname = DEFAULT_SCOREBOARD;
ap_lock_fname = DEFAULT_LOCKFILE;
diff -Nur apache_1.3.22.orig/src/main/http_core.c apache_1.3.22/src/main/http_core.c
--- apache_1.3.22.orig/src/main/http_core.c Tue Sep 4 20:15:15 2001
-+++ apache_1.3.22/src/main/http_core.c Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/main/http_core.c Tue Dec 18 23:14:29 2001
@@ -71,6 +71,7 @@
#include "util_md5.h"
#include "scoreboard.h"
#ifdef _OSD_POSIX
{ "BS2000Account", set_bs2000_account, NULL, RSRC_CONF, TAKE1,
diff -Nur apache_1.3.22.orig/src/main/http_main.c apache_1.3.22/src/main/http_main.c
---- apache_1.3.22.orig/src/main/http_main.c Fri Dec 7 17:26:57 2001
-+++ apache_1.3.22/src/main/http_main.c Fri Dec 7 17:27:28 2001
+--- apache_1.3.22.orig/src/main/http_main.c Tue Dec 18 23:14:13 2001
++++ apache_1.3.22/src/main/http_main.c Tue Dec 18 23:14:29 2001
@@ -124,6 +124,8 @@
#include <bstring.h> /* for IRIX, FD_SET calls bzero() */
#endif
case 'R':
diff -Nur apache_1.3.22.orig/src/main/http_vhost.c apache_1.3.22/src/main/http_vhost.c
--- apache_1.3.22.orig/src/main/http_vhost.c Sat Feb 24 11:09:46 2001
-+++ apache_1.3.22/src/main/http_vhost.c Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/main/http_vhost.c Tue Dec 18 23:14:29 2001
@@ -68,6 +68,7 @@
#include "http_log.h"
#include "http_vhost.h"
*/
diff -Nur apache_1.3.22.orig/src/main/rfc1413.c apache_1.3.22/src/main/rfc1413.c
--- apache_1.3.22.orig/src/main/rfc1413.c Mon Jan 15 18:05:04 2001
-+++ apache_1.3.22/src/main/rfc1413.c Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/main/rfc1413.c Tue Dec 18 23:14:29 2001
@@ -82,6 +82,7 @@
#include "http_log.h" /* for aplog_error */
#include "rfc1413.h"
ap_pclosesocket(conn->pool, sock);
diff -Nur apache_1.3.22.orig/src/main/util.c apache_1.3.22/src/main/util.c
--- apache_1.3.22.orig/src/main/util.c Wed Jul 25 15:25:18 2001
-+++ apache_1.3.22/src/main/util.c Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/main/util.c Tue Dec 18 23:14:29 2001
@@ -1962,52 +1962,87 @@
* Parses a host of the form <address>[:port]
* :port is permitted if 'port' is not NULL
+#endif
diff -Nur apache_1.3.22.orig/src/main/util_script.c apache_1.3.22/src/main/util_script.c
--- apache_1.3.22.orig/src/main/util_script.c Wed May 9 07:17:11 2001
-+++ apache_1.3.22/src/main/util_script.c Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/main/util_script.c Tue Dec 18 23:14:29 2001
@@ -67,6 +67,7 @@
#include "http_request.h" /* for sub_req_lookup_uri() */
#include "util_script.h"
ap_table_addn(e, "REMOTE_USER", c->user);
diff -Nur apache_1.3.22.orig/src/main/util_uri.c apache_1.3.22/src/main/util_uri.c
--- apache_1.3.22.orig/src/main/util_uri.c Thu Aug 23 08:38:25 2001
-+++ apache_1.3.22/src/main/util_uri.c Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/main/util_uri.c Tue Dec 18 23:14:29 2001
@@ -419,6 +419,12 @@
* the hostname. If there's a port it is the first colon.
*/
return HTTP_BAD_REQUEST;
}
diff -Nur apache_1.3.22.orig/src/modules/proxy/mod_proxy.c apache_1.3.22/src/modules/proxy/mod_proxy.c
---- apache_1.3.22.orig/src/modules/proxy/mod_proxy.c Fri Dec 7 17:26:57 2001
-+++ apache_1.3.22/src/modules/proxy/mod_proxy.c Fri Dec 7 17:27:28 2001
+--- apache_1.3.22.orig/src/modules/proxy/mod_proxy.c Tue Dec 18 23:14:13 2001
++++ apache_1.3.22/src/modules/proxy/mod_proxy.c Tue Dec 18 23:14:29 2001
@@ -555,11 +555,31 @@
struct proxy_remote *new;
char *p, *q;
}
diff -Nur apache_1.3.22.orig/src/modules/proxy/mod_proxy.h apache_1.3.22/src/modules/proxy/mod_proxy.h
--- apache_1.3.22.orig/src/modules/proxy/mod_proxy.h Fri Oct 5 10:19:15 2001
-+++ apache_1.3.22/src/modules/proxy/mod_proxy.h Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/modules/proxy/mod_proxy.h Tue Dec 18 23:14:29 2001
@@ -316,7 +316,7 @@
int ap_proxy_is_domainname(struct dirconn_entry *This, pool *p);
int ap_proxy_is_hostname(struct dirconn_entry *This, pool *p);
int ap_proxy_send_hdr_line(void *p, const char *key, const char *value);
diff -Nur apache_1.3.22.orig/src/modules/proxy/proxy_connect.c apache_1.3.22/src/modules/proxy/proxy_connect.c
--- apache_1.3.22.orig/src/modules/proxy/proxy_connect.c Fri Oct 5 10:19:15 2001
-+++ apache_1.3.22/src/modules/proxy/proxy_connect.c Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/modules/proxy/proxy_connect.c Tue Dec 18 23:14:29 2001
@@ -114,14 +114,15 @@
const char *proxyhost, int proxyport)
{
/* If we are connecting through a remote proxy, we need to pass
diff -Nur apache_1.3.22.orig/src/modules/proxy/proxy_ftp.c apache_1.3.22/src/modules/proxy/proxy_ftp.c
--- apache_1.3.22.orig/src/modules/proxy/proxy_ftp.c Fri Oct 5 10:19:15 2001
-+++ apache_1.3.22/src/modules/proxy/proxy_ftp.c Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/modules/proxy/proxy_ftp.c Tue Dec 18 23:14:29 2001
@@ -62,6 +62,7 @@
#include "http_main.h"
#include "http_log.h"
csd = accept(dsock, (struct sockaddr *) &server, &clen);
while (csd == -1 && errno == EINTR);
diff -Nur apache_1.3.22.orig/src/modules/proxy/proxy_http.c apache_1.3.22/src/modules/proxy/proxy_http.c
---- apache_1.3.22.orig/src/modules/proxy/proxy_http.c Fri Dec 7 17:26:57 2001
-+++ apache_1.3.22/src/modules/proxy/proxy_http.c Fri Dec 7 17:27:28 2001
+--- apache_1.3.22.orig/src/modules/proxy/proxy_http.c Tue Dec 18 23:14:13 2001
++++ apache_1.3.22/src/modules/proxy/proxy_http.c Tue Dec 18 23:14:29 2001
@@ -177,9 +177,8 @@
array_header *reqhdrs_arr;
table *resp_hdrs;
if (i != DECLINED) {
diff -Nur apache_1.3.22.orig/src/modules/proxy/proxy_util.c apache_1.3.22/src/modules/proxy/proxy_util.c
--- apache_1.3.22.orig/src/modules/proxy/proxy_util.c Mon Sep 24 22:14:27 2001
-+++ apache_1.3.22/src/modules/proxy/proxy_util.c Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/modules/proxy/proxy_util.c Tue Dec 18 23:14:29 2001
@@ -64,6 +64,7 @@
#include "http_log.h"
#include "util_uri.h"
diff -Nur apache_1.3.22.orig/src/modules/standard/mod_access.c apache_1.3.22/src/modules/standard/mod_access.c
--- apache_1.3.22.orig/src/modules/standard/mod_access.c Mon Jan 15 18:05:34 2001
-+++ apache_1.3.22/src/modules/standard/mod_access.c Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/modules/standard/mod_access.c Tue Dec 18 23:14:29 2001
@@ -74,7 +74,10 @@
T_ALL,
T_IP,
if (!gothost) {
diff -Nur apache_1.3.22.orig/src/modules/standard/mod_unique_id.c apache_1.3.22/src/modules/standard/mod_unique_id.c
--- apache_1.3.22.orig/src/modules/standard/mod_unique_id.c Tue Oct 2 18:11:13 2001
-+++ apache_1.3.22/src/modules/standard/mod_unique_id.c Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/modules/standard/mod_unique_id.c Tue Dec 18 23:14:29 2001
@@ -67,10 +67,22 @@
#include "http_config.h"
#include "http_log.h"
* If we use 0 as the initial counter we have a little less protection
diff -Nur apache_1.3.22.orig/src/support/ab.c apache_1.3.22/src/support/ab.c
--- apache_1.3.22.orig/src/support/ab.c Mon Oct 8 19:54:42 2001
-+++ apache_1.3.22/src/support/ab.c Fri Dec 7 17:41:39 2001
++++ apache_1.3.22/src/support/ab.c Tue Dec 18 23:17:14 2001
@@ -158,6 +158,8 @@
#include <sys/uio.h>
#endif
#endif /* NO_APACHE_INCLUDES */
#ifdef USE_SSL
+@@ -246,7 +248,7 @@
+ char servername[1024]; /* name that server reports */
+ char hostname[1024]; /* host name */
+ char proxyhost[1024]; /* proxy host name */
+-int proxyport = 0; /* proxy port */
++char *proxyport = NULL; /* proxy port */
+ int isproxy = 0;
+ char path[1024]; /* path name */
+ char postfile[1024]; /* name of file containing post data */
@@ -261,7 +263,7 @@
auth[1024], /* optional (basic/uuencoded)
* authentification */
if (errno == EINPROGRESS) {
c->state = STATE_CONNECTING;
}
-@@ -1209,16 +1216,20 @@
+@@ -1171,7 +1178,7 @@
+ struct timeval timeout, now;
+ fd_set sel_read, sel_except, sel_write;
+ long i;
+- int connectport;
++ char * connectport;
+ char * url_on_request, * host;
+
+ /* There are four hostname's involved:
+@@ -1209,16 +1216,21 @@
}
{
/* get server information */
+
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = PF_UNSPEC;
-+ error = getaddrinfo(host, port, &hints, &res);
++ hints.ai_socktype = SOCK_STREAM;
++ error = getaddrinfo(host, connectport, &hints, &res);
+ if (error) {
+ char *theerror=malloc(strlen(host)+16);
+ sprintf(theerror, "Bad hostname: %s\n", host);
}
con = malloc(concurrency * sizeof(struct connection));
-@@ -1425,7 +1436,7 @@
+@@ -1404,7 +1416,7 @@
+ if (strlen(purl) > 8 && strncmp(purl, "https://", 8) == 0) {
+ purl += 8;
+ ssl = 1;
+- port = 443;
++ port = "443";
+ }
+ #else
+ if (strlen(purl) > 8 && strncmp(purl, "https://", 8) == 0) {
+@@ -1425,7 +1437,7 @@
*cp = '\0';
strcpy(hostname, h);
if (p != NULL)
return 0;
}
-@@ -1668,3 +1679,7 @@
+@@ -1585,7 +1597,7 @@
+ if ((p = strchr(optarg, ':'))) {
+ *p = '\0';
+ p++;
+- proxyport = atoi(p);
++ proxyport = strdup(p);
+ };
+ strcpy(proxyhost, optarg);
+ isproxy = 1;
+@@ -1668,3 +1680,7 @@
exit(0);
}
+#endif
diff -Nur apache_1.3.22.orig/src/support/logresolve.c apache_1.3.22/src/support/logresolve.c
--- apache_1.3.22.orig/src/support/logresolve.c Wed May 23 00:52:21 2001
-+++ apache_1.3.22/src/support/logresolve.c Fri Dec 7 17:27:28 2001
++++ apache_1.3.22/src/support/logresolve.c Tue Dec 18 23:14:29 2001
@@ -54,7 +54,9 @@
#endif /* BEOS */
#endif /* !MPE && !WIN32*/