}
---- apache_1.3.31/src/main/http_core.c.orig Mon May 3 22:15:26 2004
-+++ apache_1.3.31/src/main/http_core.c Wed May 12 13:06:21 2004
+--- 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 @@
#include "util_md5.h"
#include "scoreboard.h"
#ifdef USE_MMAP_FILES
#include <sys/mman.h>
-@@ -565,7 +565,7 @@
+@@ -570,7 +571,7 @@
* file if you care. So the adhoc value should do.
*/
- return ap_psprintf(r->pool,"%pp%pp%pp%pp%pp",
-- (void *)&((r->connection->local_addr).sin_addr ),
-+ (void *)&(((struct sockaddr_in *)&(r->connection->local_addr))->sin_addr),
+ return ap_psprintf(r->pool,"%pA%pp%pp%pp%pp",
+- &r->connection->local_addr.sin_addr,
++ &((struct sockaddr_in *)&(r->connection->local_addr))->sin_addr,
(void *)ap_user_name,
(void *)ap_listeners,
(void *)ap_server_argv0,
-@@ -660,7 +661,9 @@
+@@ -666,7 +667,9 @@
*/
static ap_inline void do_double_reverse (conn_rec *conn)
{
if (conn->double_reverse) {
/* already done */
-@@ -672,19 +675,43 @@
+@@ -678,30 +681,54 @@
conn->remote_host = ""; /* prevent another lookup */
return;
}
+ conn->double_reverse = ok ? 1 : -1;
+ freeaddrinfo(res0);
/* invalidate possible reverse-resolved hostname if forward lookup fails */
- conn->remote_host = "";
+- conn->remote_host = "";
++ if(!ok)
++ conn->remote_host = "";
}
-@@ -692,10 +719,9 @@
+
API_EXPORT(const char *) ap_get_remote_host(conn_rec *conn, void *dir_config,
int type)
{
/* If we haven't checked the host name, and we want to */
if (dir_config) {
-@@ -717,10 +743,14 @@
+@@ -723,10 +750,14 @@
|| hostname_lookups != HOSTNAME_LOOKUP_OFF)) {
old_stat = ap_update_child_status(conn->child_num, SERVER_BUSY_DNS,
(request_rec*)NULL);
ap_str_tolower(conn->remote_host);
if (hostname_lookups == HOSTNAME_LOOKUP_DOUBLE) {
-@@ -798,6 +828,7 @@
+@@ -804,6 +835,7 @@
{
conn_rec *conn = r->connection;
core_dir_config *d;
d = (core_dir_config *)ap_get_module_config(r->per_dir_config,
&core_module);
-@@ -807,23 +838,22 @@
+@@ -813,23 +845,22 @@
}
if (d->use_canonical_name == USE_CANONICAL_NAME_DNS) {
if (conn->local_host == NULL) {
(void) ap_update_child_status(conn->child_num, old_stat, r);
}
return conn->local_host;
-@@ -835,7 +865,7 @@
+@@ -841,7 +872,7 @@
API_EXPORT(unsigned) ap_get_server_port(const request_rec *r)
{
unsigned port;
core_dir_config *d =
(core_dir_config *)ap_get_module_config(r->per_dir_config, &core_module);
-@@ -2621,12 +2651,25 @@
+@@ -2647,12 +2678,25 @@
static const char *set_bind_address(cmd_parms *cmd, void *dummy, char *arg)
{
return NULL;
}
-@@ -2658,48 +2701,71 @@
+@@ -2684,48 +2728,71 @@
return NULL;
}
new->fd = -1;
new->used = 0;
new->next = ap_listeners;
-@@ -3602,7 +3668,7 @@
+@@ -3650,7 +3717,7 @@
{ "ThreadStackSize", set_threadstacksize, NULL, RSRC_CONF, TAKE1,
"Stack size each created thread will use."},
#endif
"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"},
-@@ -3636,7 +3702,7 @@
+@@ -3684,7 +3751,7 @@
"Name of the config file to be included" },
{ "LogLevel", set_loglevel, NULL, RSRC_CONF, TAKE1,
"Level of verbosity in error logging" },
do
csd = accept(dsock, (struct sockaddr *)&server, &clen);
while (csd == -1 && errno == EINTR);
---- apache_1.3.31/src/modules/proxy/proxy_http.c.orig Wed May 12 12:56:16 2004
-+++ apache_1.3.31/src/modules/proxy/proxy_http.c Wed May 12 14:09:27 2004
+--- apache_1.3.34/src/modules/proxy/proxy_http.c.orig 2005-10-18 09:56:15.000000000 +0200
++++ apache_1.3.34/src/modules/proxy/proxy_http.c 2005-10-18 10:15:06.000000000 +0200
@@ -113,9 +113,8 @@
table *req_hdrs, *resp_hdrs;
array_header *reqhdrs_arr;
- memset(&server, '\0', sizeof(server));
- server.sin_family = AF_INET;
--
+-
/* We break the URL into host, port, path-search */
urlptr = strstr(url, "://");
if (i == -1) {
if (proxyhost != NULL)
return DECLINED; /* try again another way */
-@@ -564,17 +575,30 @@
+@@ -591,17 +602,30 @@
ap_table_set(resp_hdrs, "Content-Location", proxy_location_reverse_map(r, urlstr));
/* check if NoCache directive on this host */
ap_kill_timeout(r);
--- apache_1.3.31/src/modules/standard/mod_access.c.orig Sun Mar 7 22:47:14 2004
-+++ apache_1.3.31/src/modules/standard/mod_access.c Fri May 14 21:42:47 2004
++++ apache_1.3.31/src/modules/standard/mod_access.c Sat May 15 00:05:40 2004
@@ -31,7 +31,10 @@
T_ALL,
T_IP,
} x;
enum allowdeny_type type;
} allowdeny;
-@@ -124,94 +133,231 @@
+@@ -124,94 +133,242 @@
}
else if ((s = strchr(where, '/'))) {
+ freeaddrinfo(resmask);
a->type = T_FAIL;
- return "invalid ip address";
-+ return "network/netmask resolved to multiple addresses";
- }
+- }
- while (ap_isdigit(*t)) {
- ++t;
- }
- if (*t == '.') {
- *t++ = 0;
-- }
++ return "network/netmask resolved to multiple addresses";
+ }
- else if (*t) {
+ memcpy(&mask, resmask->ai_addr, resmask->ai_addrlen);
+ freeaddrinfo(resmask);
}
- a->x.ip.net.s_addr = ntohl(a->x.ip.net.s_addr);
- a->x.ip.mask.s_addr = ntohl(a->x.ip.mask.s_addr);
++ /* mask network address */
++ switch (a->type) {
++ case T_IP:
++ a->x.ip.net.s_addr &= a->x.ip.mask.s_addr;
++ break;
++ case T_IP6:
++ a->x.ip6.net6.s6_addr32[0] &= a->x.ip6.mask6.s6_addr32[0];
++ a->x.ip6.net6.s6_addr32[1] &= a->x.ip6.mask6.s6_addr32[1];
++ a->x.ip6.net6.s6_addr32[2] &= a->x.ip6.mask6.s6_addr32[2];
++ a->x.ip6.net6.s6_addr32[3] &= a->x.ip6.mask6.s6_addr32[3];
++ }
}
else {
- a->type = T_HOST;
return NULL;
}
-@@ -275,13 +421,63 @@
+@@ -275,13 +432,63 @@
return 1;
case T_IP:
dcfg = ap_get_module_config(r->per_dir_config, &usertrack_module);
--- apache_1.3.31/src/modules/standard/mod_rewrite.c.orig Wed May 12 14:57:09 2004
+++ apache_1.3.31/src/modules/standard/mod_rewrite.c Wed May 12 15:40:04 2004
-@@ -3651,8 +3651,19 @@
+@@ -48,6 +48,7 @@
+
+
+ #include "mod_rewrite.h"
++#include "sa_len.h"
+
+ #ifndef NO_WRITEV
+ #ifndef NETWARE
+@@ -3651,8 +3652,19 @@
result = r->connection->remote_ip;
}
else if (strcasecmp(var, "REMOTE_PORT") == 0) {
projects / packages / apache.git / blobdiff