From d72fdc2dfceb062c22b6d94e64f2b9494f51b61f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sat, 2 Oct 2004 14:34:52 +0000 Subject: [PATCH] - ldap fixes Changed files: apache-apr1.patch -> 1.3 --- apache-apr1.patch | 276 ++++++++++++++++++++++++++-------------------- 1 file changed, 157 insertions(+), 119 deletions(-) diff --git a/apache-apr1.patch b/apache-apr1.patch index 3491098..1765ae3 100644 --- a/apache-apr1.patch +++ b/apache-apr1.patch @@ -1,6 +1,6 @@ diff -ur httpd-2.0.52.org/include/ap_compat.h httpd-2.0.52/include/ap_compat.h ---- httpd-2.0.52.org/include/ap_compat.h 2004-10-01 01:16:27.985755167 +0200 -+++ httpd-2.0.52/include/ap_compat.h 2004-10-01 01:17:32.608911172 +0200 +--- httpd-2.0.52.org/include/ap_compat.h 2004-10-02 18:25:54.675501812 +0200 ++++ httpd-2.0.52/include/ap_compat.h 2004-10-02 18:26:13.003575452 +0200 @@ -17,7 +17,6 @@ #define AP_COMPAT_H @@ -10,8 +10,8 @@ diff -ur httpd-2.0.52.org/include/ap_compat.h httpd-2.0.52/include/ap_compat.h /* redefine 1.3.x symbols to the new symbol names */ diff -ur httpd-2.0.52.org/include/util_ldap.h httpd-2.0.52/include/util_ldap.h ---- httpd-2.0.52.org/include/util_ldap.h 2004-10-01 01:16:28.025746600 +0200 -+++ httpd-2.0.52/include/util_ldap.h 2004-10-01 01:17:32.715888254 +0200 +--- httpd-2.0.52.org/include/util_ldap.h 2004-10-02 18:25:54.679500955 +0200 ++++ httpd-2.0.52/include/util_ldap.h 2004-10-02 18:29:46.928747001 +0200 @@ -19,7 +19,7 @@ #include @@ -21,10 +21,16 @@ diff -ur httpd-2.0.52.org/include/util_ldap.h httpd-2.0.52/include/util_ldap.h /* APR header files */ #include -Tylko w httpd-2.0.52: LOG +@@ -291,5 +291,5 @@ + */ + char *util_ald_cache_display(request_rec *r, util_ldap_state_t *st); + +-#endif /* APU_HAS_LDAP */ ++#endif /* APR_HAS_LDAP */ + #endif /* UTIL_LDAP_H */ diff -ur httpd-2.0.52.org/modules/aaa/mod_auth_digest.c httpd-2.0.52/modules/aaa/mod_auth_digest.c ---- httpd-2.0.52.org/modules/aaa/mod_auth_digest.c 2004-10-01 01:16:28.227703335 +0200 -+++ httpd-2.0.52/modules/aaa/mod_auth_digest.c 2004-10-01 01:17:32.626907316 +0200 +--- httpd-2.0.52.org/modules/aaa/mod_auth_digest.c 2004-10-02 18:25:54.710494315 +0200 ++++ httpd-2.0.52/modules/aaa/mod_auth_digest.c 2004-10-02 18:26:13.010573952 +0200 @@ -119,7 +119,7 @@ unsigned long key; /* the key for this entry */ struct hash_entry *next; /* next entry in the bucket */ @@ -35,8 +41,8 @@ diff -ur httpd-2.0.52.org/modules/aaa/mod_auth_digest.c httpd-2.0.52/modules/aaa } client_entry; diff -ur httpd-2.0.52.org/modules/cache/mod_file_cache.c httpd-2.0.52/modules/cache/mod_file_cache.c ---- httpd-2.0.52.org/modules/cache/mod_file_cache.c 2004-10-01 01:16:28.933552124 +0200 -+++ httpd-2.0.52/modules/cache/mod_file_cache.c 2004-10-01 01:17:32.647902818 +0200 +--- httpd-2.0.52.org/modules/cache/mod_file_cache.c 2004-10-02 18:25:56.189177542 +0200 ++++ httpd-2.0.52/modules/cache/mod_file_cache.c 2004-10-02 18:26:13.012573524 +0200 @@ -275,7 +275,7 @@ apr_mmap_t *mm; apr_bucket_brigade *bb = apr_brigade_create(r->pool, c->bucket_alloc); @@ -47,8 +53,8 @@ diff -ur httpd-2.0.52.org/modules/cache/mod_file_cache.c httpd-2.0.52/modules/ca c->bucket_alloc); APR_BRIGADE_INSERT_TAIL(bb, b); diff -ur httpd-2.0.52.org/modules/dav/fs/lock.c httpd-2.0.52/modules/dav/fs/lock.c ---- httpd-2.0.52.org/modules/dav/fs/lock.c 2004-10-01 01:16:28.232702264 +0200 -+++ httpd-2.0.52/modules/dav/fs/lock.c 2004-10-01 01:17:32.634905603 +0200 +--- httpd-2.0.52.org/modules/dav/fs/lock.c 2004-10-02 18:25:54.715493244 +0200 ++++ httpd-2.0.52/modules/dav/fs/lock.c 2004-10-02 18:26:13.016572667 +0200 @@ -632,7 +632,7 @@ apr_status_t rv; @@ -59,8 +65,8 @@ diff -ur httpd-2.0.52.org/modules/dav/fs/lock.c httpd-2.0.52/modules/dav/fs/lock if ((err = dav_fs_remove_locknull_member(p, fname, &buf)) != NULL) { /* ### push a higher-level description? */ diff -ur httpd-2.0.52.org/modules/dav/fs/repos.c httpd-2.0.52/modules/dav/fs/repos.c ---- httpd-2.0.52.org/modules/dav/fs/repos.c 2004-10-01 01:16:28.229702907 +0200 -+++ httpd-2.0.52/modules/dav/fs/repos.c 2004-10-01 01:17:32.630906460 +0200 +--- httpd-2.0.52.org/modules/dav/fs/repos.c 2004-10-02 18:25:54.713493673 +0200 ++++ httpd-2.0.52/modules/dav/fs/repos.c 2004-10-02 18:26:13.020571811 +0200 @@ -1453,8 +1453,8 @@ @@ -73,8 +79,8 @@ diff -ur httpd-2.0.52.org/modules/dav/fs/repos.c httpd-2.0.52/modules/dav/fs/rep /* woah! where'd it go? */ /* ### should have a better error here */ diff -ur httpd-2.0.52.org/modules/dav/main/util.c httpd-2.0.52/modules/dav/main/util.c ---- httpd-2.0.52.org/modules/dav/main/util.c 2004-10-01 01:16:28.239700765 +0200 -+++ httpd-2.0.52/modules/dav/main/util.c 2004-10-01 01:17:32.638904746 +0200 +--- httpd-2.0.52.org/modules/dav/main/util.c 2004-10-02 18:25:54.724491317 +0200 ++++ httpd-2.0.52/modules/dav/main/util.c 2004-10-02 18:26:13.025570740 +0200 @@ -213,7 +213,7 @@ /* now, verify that the URI uses the same scheme as the current. request. the port must match our port. @@ -85,8 +91,8 @@ diff -ur httpd-2.0.52.org/modules/dav/main/util.c httpd-2.0.52/modules/dav/main/ #ifdef APACHE_PORT_HANDLING_IS_BUSTED || comp.port != port diff -ur httpd-2.0.52.org/modules/experimental/mod_auth_ldap.c httpd-2.0.52/modules/experimental/mod_auth_ldap.c ---- httpd-2.0.52.org/modules/experimental/mod_auth_ldap.c 2004-10-01 01:16:29.419448032 +0200 -+++ httpd-2.0.52/modules/experimental/mod_auth_ldap.c 2004-10-01 01:17:32.696892324 +0200 +--- httpd-2.0.52.org/modules/experimental/mod_auth_ldap.c 2004-10-02 18:25:56.315150555 +0200 ++++ httpd-2.0.52/modules/experimental/mod_auth_ldap.c 2004-10-02 18:26:13.028570097 +0200 @@ -42,7 +42,7 @@ #include "http_request.h" #include "util_ldap.h" @@ -134,8 +140,8 @@ diff -ur httpd-2.0.52.org/modules/experimental/mod_auth_ldap.c httpd-2.0.52/modu } diff -ur httpd-2.0.52.org/modules/experimental/mod_cache.h httpd-2.0.52/modules/experimental/mod_cache.h ---- httpd-2.0.52.org/modules/experimental/mod_cache.h 2004-10-01 01:16:29.349463025 +0200 -+++ httpd-2.0.52/modules/experimental/mod_cache.h 2004-10-01 01:17:32.686894465 +0200 +--- httpd-2.0.52.org/modules/experimental/mod_cache.h 2004-10-02 18:25:56.308152055 +0200 ++++ httpd-2.0.52/modules/experimental/mod_cache.h 2004-10-02 18:26:13.030569669 +0200 @@ -172,7 +172,7 @@ void *vobj; /* Opaque portion (specific to the cache implementation) of the cache object */ apr_size_t count; /* Number of body bytes written to the cache so far */ @@ -146,8 +152,8 @@ diff -ur httpd-2.0.52.org/modules/experimental/mod_cache.h httpd-2.0.52/modules/ }; diff -ur httpd-2.0.52.org/modules/experimental/mod_case_filter.c httpd-2.0.52/modules/experimental/mod_case_filter.c ---- httpd-2.0.52.org/modules/experimental/mod_case_filter.c 2004-10-01 01:16:29.423447175 +0200 -+++ httpd-2.0.52/modules/experimental/mod_case_filter.c 2004-10-01 01:17:32.688894037 +0200 +--- httpd-2.0.52.org/modules/experimental/mod_case_filter.c 2004-10-02 18:25:56.324148628 +0200 ++++ httpd-2.0.52/modules/experimental/mod_case_filter.c 2004-10-02 18:26:13.035568598 +0200 @@ -60,7 +60,7 @@ apr_bucket_brigade *pbbOut; @@ -158,8 +164,8 @@ diff -ur httpd-2.0.52.org/modules/experimental/mod_case_filter.c httpd-2.0.52/mo const char *data; apr_size_t len; diff -ur httpd-2.0.52.org/modules/experimental/mod_mem_cache.c httpd-2.0.52/modules/experimental/mod_mem_cache.c ---- httpd-2.0.52.org/modules/experimental/mod_mem_cache.c 2004-10-01 01:16:29.346463667 +0200 -+++ httpd-2.0.52/modules/experimental/mod_mem_cache.c 2004-10-01 01:19:11.266776038 +0200 +--- httpd-2.0.52.org/modules/experimental/mod_mem_cache.c 2004-10-02 18:25:56.307152269 +0200 ++++ httpd-2.0.52/modules/experimental/mod_mem_cache.c 2004-10-02 18:26:13.039567741 +0200 @@ -140,14 +140,14 @@ cache_object_t *obj = (cache_object_t *)a; mem_cache_object_t *mobj = obj->vobj; @@ -284,12 +290,9 @@ diff -ur httpd-2.0.52.org/modules/experimental/mod_mem_cache.c httpd-2.0.52/modu } if (sconf->lock) { -Tylko w httpd-2.0.52/modules/experimental: mod_mem_cache.c~ -Tylko w httpd-2.0.52/modules/experimental: mod_mem_cache.c.orig -Tylko w httpd-2.0.52/modules/experimental: mod_mem_cache.c.rej diff -ur httpd-2.0.52.org/modules/experimental/util_ldap.c httpd-2.0.52/modules/experimental/util_ldap.c ---- httpd-2.0.52.org/modules/experimental/util_ldap.c 2004-10-01 01:16:29.422447389 +0200 -+++ httpd-2.0.52/modules/experimental/util_ldap.c 2004-10-01 01:17:32.691893395 +0200 +--- httpd-2.0.52.org/modules/experimental/util_ldap.c 2004-10-02 18:25:56.324148628 +0200 ++++ httpd-2.0.52/modules/experimental/util_ldap.c 2004-10-02 18:26:13.043566884 +0200 @@ -38,7 +38,7 @@ #include #endif @@ -299,9 +302,27 @@ diff -ur httpd-2.0.52.org/modules/experimental/util_ldap.c httpd-2.0.52/modules/ #error mod_ldap requires APR-util to have LDAP support built in #endif +diff -ur httpd-2.0.52.org/modules/experimental/util_ldap_cache.c httpd-2.0.52/modules/experimental/util_ldap_cache.c +--- httpd-2.0.52.org/modules/experimental/util_ldap_cache.c 2004-10-02 18:25:56.310151626 +0200 ++++ httpd-2.0.52/modules/experimental/util_ldap_cache.c 2004-10-02 18:29:51.839694945 +0200 +@@ -26,7 +26,7 @@ + #include "util_ldap.h" + #include "util_ldap_cache.h" + +-#ifdef APU_HAS_LDAP ++#ifdef APR_HAS_LDAP + + #if APR_HAS_SHARED_MEMORY + #define MODLDAP_SHMEM_CACHE "/tmp/mod_ldap_cache" +@@ -426,4 +426,4 @@ + } + + +-#endif /* APU_HAS_LDAP */ ++#endif /* APR_HAS_LDAP */ diff -ur httpd-2.0.52.org/modules/experimental/util_ldap_cache.h httpd-2.0.52/modules/experimental/util_ldap_cache.h ---- httpd-2.0.52.org/modules/experimental/util_ldap_cache.h 2004-10-01 01:16:29.369458741 +0200 -+++ httpd-2.0.52/modules/experimental/util_ldap_cache.h 2004-10-01 01:17:32.693892966 +0200 +--- httpd-2.0.52.org/modules/experimental/util_ldap_cache.h 2004-10-02 18:25:56.311151412 +0200 ++++ httpd-2.0.52/modules/experimental/util_ldap_cache.h 2004-10-02 18:26:13.045566456 +0200 @@ -21,7 +21,7 @@ */ @@ -311,9 +332,27 @@ diff -ur httpd-2.0.52.org/modules/experimental/util_ldap_cache.h httpd-2.0.52/mo /* +diff -ur httpd-2.0.52.org/modules/experimental/util_ldap_cache_mgr.c httpd-2.0.52/modules/experimental/util_ldap_cache_mgr.c +--- httpd-2.0.52.org/modules/experimental/util_ldap_cache_mgr.c 2004-10-02 18:25:56.312151198 +0200 ++++ httpd-2.0.52/modules/experimental/util_ldap_cache_mgr.c 2004-10-02 18:29:58.135346250 +0200 +@@ -26,7 +26,7 @@ + #include "util_ldap_cache.h" + #include + +-#ifdef APU_HAS_LDAP ++#ifdef APR_HAS_LDAP + + /* only here until strdup is gone */ + #include +@@ -737,4 +737,4 @@ + return buf; + } + +-#endif /* APU_HAS_LDAP */ ++#endif /* APR_HAS_LDAP */ diff -ur httpd-2.0.52.org/modules/filters/mod_deflate.c httpd-2.0.52/modules/filters/mod_deflate.c ---- httpd-2.0.52.org/modules/filters/mod_deflate.c 2004-10-01 01:16:29.197495580 +0200 -+++ httpd-2.0.52/modules/filters/mod_deflate.c 2004-10-01 01:17:32.678896179 +0200 +--- httpd-2.0.52.org/modules/filters/mod_deflate.c 2004-10-02 18:25:56.233168118 +0200 ++++ httpd-2.0.52/modules/filters/mod_deflate.c 2004-10-02 18:26:13.049565599 +0200 @@ -694,7 +694,7 @@ return rv; } @@ -324,8 +363,8 @@ diff -ur httpd-2.0.52.org/modules/filters/mod_deflate.c httpd-2.0.52/modules/fil apr_size_t len; diff -ur httpd-2.0.52.org/modules/filters/mod_ext_filter.c httpd-2.0.52/modules/filters/mod_ext_filter.c ---- httpd-2.0.52.org/modules/filters/mod_ext_filter.c 2004-10-01 01:16:29.198495366 +0200 -+++ httpd-2.0.52/modules/filters/mod_ext_filter.c 2004-10-01 01:17:32.675896821 +0200 +--- httpd-2.0.52.org/modules/filters/mod_ext_filter.c 2004-10-02 18:25:56.235167690 +0200 ++++ httpd-2.0.52/modules/filters/mod_ext_filter.c 2004-10-02 18:26:13.329505629 +0200 @@ -487,18 +487,15 @@ #if APR_FILES_AS_SOCKETS @@ -364,8 +403,8 @@ diff -ur httpd-2.0.52.org/modules/filters/mod_ext_filter.c httpd-2.0.52/modules/ if (APR_BUCKET_IS_EOS(b)) { eos = b; diff -ur httpd-2.0.52.org/modules/filters/mod_include.c httpd-2.0.52/modules/filters/mod_include.c ---- httpd-2.0.52.org/modules/filters/mod_include.c 2004-10-01 01:16:29.195496008 +0200 -+++ httpd-2.0.52/modules/filters/mod_include.c 2004-10-01 01:17:32.684894894 +0200 +--- httpd-2.0.52.org/modules/filters/mod_include.c 2004-10-02 18:25:56.231168547 +0200 ++++ httpd-2.0.52/modules/filters/mod_include.c 2004-10-02 18:26:13.343502630 +0200 @@ -209,7 +209,7 @@ val = ap_ht_time(r->pool, r->finfo.mtime, conf->default_time_fmt, 0); } @@ -399,8 +438,8 @@ diff -ur httpd-2.0.52.org/modules/filters/mod_include.c httpd-2.0.52/modules/fil return rv; } diff -ur httpd-2.0.52.org/modules/generators/mod_autoindex.c httpd-2.0.52/modules/generators/mod_autoindex.c ---- httpd-2.0.52.org/modules/generators/mod_autoindex.c 2004-10-01 01:16:29.518426828 +0200 -+++ httpd-2.0.52/modules/generators/mod_autoindex.c 2004-10-01 01:17:32.707889968 +0200 +--- httpd-2.0.52.org/modules/generators/mod_autoindex.c 2004-10-02 18:25:56.335146272 +0200 ++++ httpd-2.0.52/modules/generators/mod_autoindex.c 2004-10-02 18:26:13.419486353 +0200 @@ -773,7 +773,7 @@ */ @@ -429,8 +468,8 @@ diff -ur httpd-2.0.52.org/modules/generators/mod_autoindex.c httpd-2.0.52/module return (NULL); #endif /* !CASE_BLIND_FILESYSTEM */ diff -ur httpd-2.0.52.org/modules/generators/mod_cgi.c httpd-2.0.52/modules/generators/mod_cgi.c ---- httpd-2.0.52.org/modules/generators/mod_cgi.c 2004-10-01 01:16:29.521426186 +0200 -+++ httpd-2.0.52/modules/generators/mod_cgi.c 2004-10-01 01:17:32.710889325 +0200 +--- httpd-2.0.52.org/modules/generators/mod_cgi.c 2004-10-02 18:25:56.337145843 +0200 ++++ httpd-2.0.52/modules/generators/mod_cgi.c 2004-10-02 18:26:13.424485282 +0200 @@ -274,7 +274,7 @@ apr_file_printf(f, "%s\n", sbuf); @@ -477,8 +516,8 @@ diff -ur httpd-2.0.52.org/modules/generators/mod_cgi.c httpd-2.0.52/modules/gene apr_size_t len; diff -ur httpd-2.0.52.org/modules/generators/mod_cgid.c httpd-2.0.52/modules/generators/mod_cgid.c ---- httpd-2.0.52.org/modules/generators/mod_cgid.c 2004-10-01 01:16:29.540422116 +0200 -+++ httpd-2.0.52/modules/generators/mod_cgid.c 2004-10-01 01:17:32.713888683 +0200 +--- httpd-2.0.52.org/modules/generators/mod_cgid.c 2004-10-02 18:25:56.369138990 +0200 ++++ httpd-2.0.52/modules/generators/mod_cgid.c 2004-10-02 18:26:13.431483782 +0200 @@ -748,7 +748,7 @@ */ ap_log_error(APLOG_MARK, APLOG_ERR, rc, r->server, @@ -528,8 +567,8 @@ diff -ur httpd-2.0.52.org/modules/generators/mod_cgid.c httpd-2.0.52/modules/gen apr_size_t len; diff -ur httpd-2.0.52.org/modules/http/http_core.c httpd-2.0.52/modules/http/http_core.c ---- httpd-2.0.52.org/modules/http/http_core.c 2004-10-01 01:16:28.712599458 +0200 -+++ httpd-2.0.52/modules/http/http_core.c 2004-10-01 01:17:32.610910743 +0200 +--- httpd-2.0.52.org/modules/http/http_core.c 2004-10-02 18:25:55.959226804 +0200 ++++ httpd-2.0.52/modules/http/http_core.c 2004-10-02 18:26:13.435482926 +0200 @@ -115,7 +115,7 @@ */ char chunk_hdr[20]; /* enough space for the snprintf below */ @@ -540,8 +579,8 @@ diff -ur httpd-2.0.52.org/modules/http/http_core.c httpd-2.0.52/modules/http/htt /* there shouldn't be anything after the eos */ eos = e; diff -ur httpd-2.0.52.org/modules/http/http_protocol.c httpd-2.0.52/modules/http/http_protocol.c ---- httpd-2.0.52.org/modules/http/http_protocol.c 2004-10-01 01:16:28.710599886 +0200 -+++ httpd-2.0.52/modules/http/http_protocol.c 2004-10-01 01:17:32.615909672 +0200 +--- httpd-2.0.52.org/modules/http/http_protocol.c 2004-10-02 18:25:55.957227232 +0200 ++++ httpd-2.0.52/modules/http/http_protocol.c 2004-10-02 18:26:13.443481212 +0200 @@ -1534,7 +1534,7 @@ } } @@ -561,8 +600,8 @@ diff -ur httpd-2.0.52.org/modules/http/http_protocol.c httpd-2.0.52/modules/http apr_size_t len; diff -ur httpd-2.0.52.org/modules/mappers/mod_negotiation.c httpd-2.0.52/modules/mappers/mod_negotiation.c ---- httpd-2.0.52.org/modules/mappers/mod_negotiation.c 2004-10-01 01:16:29.046527921 +0200 -+++ httpd-2.0.52/modules/mappers/mod_negotiation.c 2004-10-01 01:17:32.664899177 +0200 +--- httpd-2.0.52.org/modules/mappers/mod_negotiation.c 2004-10-02 18:25:56.206173901 +0200 ++++ httpd-2.0.52/modules/mappers/mod_negotiation.c 2004-10-02 18:26:13.449479927 +0200 @@ -959,7 +959,7 @@ break; } @@ -573,8 +612,8 @@ diff -ur httpd-2.0.52.org/modules/mappers/mod_negotiation.c httpd-2.0.52/modules } else { diff -ur httpd-2.0.52.org/modules/mappers/mod_rewrite.c httpd-2.0.52/modules/mappers/mod_rewrite.c ---- httpd-2.0.52.org/modules/mappers/mod_rewrite.c 2004-10-01 01:16:29.043528564 +0200 -+++ httpd-2.0.52/modules/mappers/mod_rewrite.c 2004-10-01 01:17:32.671897678 +0200 +--- httpd-2.0.52.org/modules/mappers/mod_rewrite.c 2004-10-02 18:25:56.203174544 +0200 ++++ httpd-2.0.52/modules/mappers/mod_rewrite.c 2004-10-02 18:26:13.457478214 +0200 @@ -2323,7 +2323,7 @@ } else if (strcmp(p->pattern, "-l") == 0) { @@ -610,8 +649,8 @@ diff -ur httpd-2.0.52.org/modules/mappers/mod_rewrite.c httpd-2.0.52/modules/map } else if (strcasecmp(var, "HTTPS") == 0) { int flag = rewrite_is_https && rewrite_is_https(r->connection); diff -ur httpd-2.0.52.org/modules/mappers/mod_userdir.c httpd-2.0.52/modules/mappers/mod_userdir.c ---- httpd-2.0.52.org/modules/mappers/mod_userdir.c 2004-10-01 01:16:29.053526422 +0200 -+++ httpd-2.0.52/modules/mappers/mod_userdir.c 2004-10-01 01:17:32.673897250 +0200 +--- httpd-2.0.52.org/modules/mappers/mod_userdir.c 2004-10-02 18:25:56.215171973 +0200 ++++ httpd-2.0.52/modules/mappers/mod_userdir.c 2004-10-02 18:26:13.459477785 +0200 @@ -282,7 +282,7 @@ #if APR_HAS_USER char *homedir; @@ -631,8 +670,8 @@ diff -ur httpd-2.0.52.org/modules/mappers/mod_userdir.c httpd-2.0.52/modules/map } diff -ur httpd-2.0.52.org/modules/proxy/proxy_connect.c httpd-2.0.52/modules/proxy/proxy_connect.c ---- httpd-2.0.52.org/modules/proxy/proxy_connect.c 2004-10-01 01:16:29.014534775 +0200 -+++ httpd-2.0.52/modules/proxy/proxy_connect.c 2004-10-01 01:17:32.659900248 +0200 +--- httpd-2.0.52.org/modules/proxy/proxy_connect.c 2004-10-02 18:25:56.197175829 +0200 ++++ httpd-2.0.52/modules/proxy/proxy_connect.c 2004-10-02 18:26:13.463476929 +0200 @@ -224,10 +224,10 @@ "proxy: CONNECT: sending the CONNECT request to the remote proxy"); nbytes = apr_snprintf(buffer, sizeof(buffer), @@ -735,8 +774,8 @@ diff -ur httpd-2.0.52.org/modules/proxy/proxy_connect.c httpd-2.0.52/modules/pro o += nbytes; i -= nbytes; diff -ur httpd-2.0.52.org/modules/proxy/proxy_ftp.c httpd-2.0.52/modules/proxy/proxy_ftp.c ---- httpd-2.0.52.org/modules/proxy/proxy_ftp.c 2004-10-01 01:16:29.013534989 +0200 -+++ httpd-2.0.52/modules/proxy/proxy_ftp.c 2004-10-01 01:17:32.654901319 +0200 +--- httpd-2.0.52.org/modules/proxy/proxy_ftp.c 2004-10-02 18:25:56.196176043 +0200 ++++ httpd-2.0.52/modules/proxy/proxy_ftp.c 2004-10-02 18:26:13.468475858 +0200 @@ -931,7 +931,7 @@ int failed = 1; while (connect_addr) { @@ -834,8 +873,8 @@ diff -ur httpd-2.0.52.org/modules/proxy/proxy_ftp.c httpd-2.0.52/modules/proxy/p continue; } diff -ur httpd-2.0.52.org/modules/proxy/proxy_http.c httpd-2.0.52/modules/proxy/proxy_http.c ---- httpd-2.0.52.org/modules/proxy/proxy_http.c 2004-10-01 01:16:28.936551481 +0200 -+++ httpd-2.0.52/modules/proxy/proxy_http.c 2004-10-01 01:17:32.657900677 +0200 +--- httpd-2.0.52.org/modules/proxy/proxy_http.c 2004-10-02 18:25:56.191177114 +0200 ++++ httpd-2.0.52/modules/proxy/proxy_http.c 2004-10-02 18:26:13.471475215 +0200 @@ -294,7 +294,7 @@ apr_socket_timeout_get(p_conn->sock, ¤t_timeout); /* set no timeout */ @@ -846,8 +885,8 @@ diff -ur httpd-2.0.52.org/modules/proxy/proxy_http.c httpd-2.0.52/modules/proxy/ apr_socket_timeout_set(p_conn->sock, current_timeout); if ( APR_STATUS_IS_EOF(socket_status) ) { diff -ur httpd-2.0.52.org/modules/proxy/proxy_util.c httpd-2.0.52/modules/proxy/proxy_util.c ---- httpd-2.0.52.org/modules/proxy/proxy_util.c 2004-10-01 01:16:28.966545056 +0200 -+++ httpd-2.0.52/modules/proxy/proxy_util.c 2004-10-01 01:17:32.650902176 +0200 +--- httpd-2.0.52.org/modules/proxy/proxy_util.c 2004-10-02 18:25:56.194176471 +0200 ++++ httpd-2.0.52/modules/proxy/proxy_util.c 2004-10-02 18:26:13.475474358 +0200 @@ -1102,7 +1102,7 @@ while (backend_addr && !connected) { @@ -867,8 +906,8 @@ diff -ur httpd-2.0.52.org/modules/proxy/proxy_util.c httpd-2.0.52/modules/proxy/ /* if an error occurred, loop round and try again */ if (rv != APR_SUCCESS) { diff -ur httpd-2.0.52.org/modules/ssl/mod_ssl.c httpd-2.0.52/modules/ssl/mod_ssl.c ---- httpd-2.0.52.org/modules/ssl/mod_ssl.c 2004-10-01 01:16:28.403665640 +0200 -+++ httpd-2.0.52/modules/ssl/mod_ssl.c 2004-10-01 01:17:32.640904318 +0200 +--- httpd-2.0.52.org/modules/ssl/mod_ssl.c 2004-10-02 18:25:54.741487676 +0200 ++++ httpd-2.0.52/modules/ssl/mod_ssl.c 2004-10-02 18:26:13.477473930 +0200 @@ -333,7 +333,7 @@ sc->vhost_id_len); @@ -879,8 +918,8 @@ diff -ur httpd-2.0.52.org/modules/ssl/mod_ssl.c httpd-2.0.52/modules/ssl/mod_ssl ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, "Unable to set session id context to `%s'", vhost_md5); diff -ur httpd-2.0.52.org/modules/ssl/ssl_engine_init.c httpd-2.0.52/modules/ssl/ssl_engine_init.c ---- httpd-2.0.52.org/modules/ssl/ssl_engine_init.c 2004-10-01 01:16:28.423661356 +0200 -+++ httpd-2.0.52/modules/ssl/ssl_engine_init.c 2004-10-01 01:17:32.643903675 +0200 +--- httpd-2.0.52.org/modules/ssl/ssl_engine_init.c 2004-10-02 18:25:54.753485106 +0200 ++++ httpd-2.0.52/modules/ssl/ssl_engine_init.c 2004-10-02 18:26:13.481473073 +0200 @@ -823,11 +823,11 @@ } @@ -896,8 +935,8 @@ diff -ur httpd-2.0.52.org/modules/ssl/ssl_engine_init.c httpd-2.0.52/modules/ssl ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, "%s server certificate wildcard CommonName (CN) `%s' " diff -ur httpd-2.0.52.org/modules/ssl/ssl_scache_dbm.c httpd-2.0.52/modules/ssl/ssl_scache_dbm.c ---- httpd-2.0.52.org/modules/ssl/ssl_scache_dbm.c 2004-10-01 01:16:28.422661570 +0200 -+++ httpd-2.0.52/modules/ssl/ssl_scache_dbm.c 2004-10-01 01:17:32.645903247 +0200 +--- httpd-2.0.52.org/modules/ssl/ssl_scache_dbm.c 2004-10-02 18:25:54.752485320 +0200 ++++ httpd-2.0.52/modules/ssl/ssl_scache_dbm.c 2004-10-02 18:26:13.509467076 +0200 @@ -84,7 +84,7 @@ SSLModConfigRec *mc = myModConfig(s); apr_pool_t *p; @@ -917,8 +956,8 @@ diff -ur httpd-2.0.52.org/modules/ssl/ssl_scache_dbm.c httpd-2.0.52/modules/ssl/ break; if ((keylist = apr_palloc(p, sizeof(dbmkey)*KEYMAX)) == NULL) { diff -ur httpd-2.0.52.org/os/unix/unixd.c httpd-2.0.52/os/unix/unixd.c ---- httpd-2.0.52.org/os/unix/unixd.c 2004-10-01 01:16:29.554419118 +0200 -+++ httpd-2.0.52/os/unix/unixd.c 2004-10-01 01:17:32.622908173 +0200 +--- httpd-2.0.52.org/os/unix/unixd.c 2004-10-02 18:25:57.168967645 +0200 ++++ httpd-2.0.52/os/unix/unixd.c 2004-10-02 18:26:13.513466220 +0200 @@ -464,7 +464,7 @@ apr_status_t status; @@ -929,8 +968,8 @@ diff -ur httpd-2.0.52.org/os/unix/unixd.c httpd-2.0.52/os/unix/unixd.c *accepted = csd; return APR_SUCCESS; diff -ur httpd-2.0.52.org/server/config.c httpd-2.0.52/server/config.c ---- httpd-2.0.52.org/server/config.c 2004-10-01 01:16:29.746377995 +0200 -+++ httpd-2.0.52/server/config.c 2004-10-01 01:17:32.564920595 +0200 +--- httpd-2.0.52.org/server/config.c 2004-10-02 18:25:57.290941515 +0200 ++++ httpd-2.0.52/server/config.c 2004-10-02 18:26:13.518465149 +0200 @@ -1546,7 +1546,7 @@ && !(strcmp(fname, ap_server_root_relative(p, SERVER_CONFIG_FILE)))) { apr_finfo_t finfo; @@ -950,8 +989,8 @@ diff -ur httpd-2.0.52.org/server/config.c httpd-2.0.52/server/config.c fnew->fname = ap_make_full_path(p, path, dirent.name); } diff -ur httpd-2.0.52.org/server/connection.c httpd-2.0.52/server/connection.c ---- httpd-2.0.52.org/server/connection.c 2004-10-01 01:16:29.743378637 +0200 -+++ httpd-2.0.52/server/connection.c 2004-10-01 01:17:32.602912457 +0200 +--- httpd-2.0.52.org/server/connection.c 2004-10-02 18:25:57.286942372 +0200 ++++ httpd-2.0.52/server/connection.c 2004-10-02 18:26:13.520464720 +0200 @@ -131,7 +131,7 @@ /* Shut down the socket for write, which will send a FIN * to the peer. @@ -971,8 +1010,8 @@ diff -ur httpd-2.0.52.org/server/connection.c httpd-2.0.52/server/connection.c break; diff -ur httpd-2.0.52.org/server/core.c httpd-2.0.52/server/core.c ---- httpd-2.0.52.org/server/core.c 2004-10-01 01:16:29.868351865 +0200 -+++ httpd-2.0.52/server/core.c 2004-10-01 01:17:32.578917597 +0200 +--- httpd-2.0.52.org/server/core.c 2004-10-02 18:25:57.303938731 +0200 ++++ httpd-2.0.52/server/core.c 2004-10-02 18:26:13.531462364 +0200 @@ -2916,7 +2916,7 @@ /* XXX handle checking for non-blocking socket */ @@ -1037,8 +1076,8 @@ diff -ur httpd-2.0.52.org/server/core.c httpd-2.0.52/server/core.c if (logio_add_bytes_out && bytes_sent > 0) logio_add_bytes_out(c, bytes_sent); diff -ur httpd-2.0.52.org/server/core.c.orig httpd-2.0.52/server/core.c.orig ---- httpd-2.0.52.org/server/core.c.orig 2004-10-01 01:16:29.835358933 +0200 -+++ httpd-2.0.52/server/core.c.orig 2004-10-01 01:15:36.982681379 +0200 +--- httpd-2.0.52.org/server/core.c.orig 2004-10-02 18:25:57.296940230 +0200 ++++ httpd-2.0.52/server/core.c.orig 2004-10-02 18:26:13.667433236 +0200 @@ -4298,6 +4298,25 @@ ap_set_version(pconf); @@ -1066,8 +1105,8 @@ diff -ur httpd-2.0.52.org/server/core.c.orig httpd-2.0.52/server/core.c.orig } diff -ur httpd-2.0.52.org/server/listen.c httpd-2.0.52/server/listen.c ---- httpd-2.0.52.org/server/listen.c 2004-10-01 01:16:29.869351651 +0200 -+++ httpd-2.0.52/server/listen.c 2004-10-01 01:17:32.580917169 +0200 +--- httpd-2.0.52.org/server/listen.c 2004-10-02 18:25:57.304938516 +0200 ++++ httpd-2.0.52/server/listen.c 2004-10-02 18:26:13.670432593 +0200 @@ -122,7 +122,7 @@ ap_sock_disable_nagle(s); #endif @@ -1118,8 +1157,8 @@ diff -ur httpd-2.0.52.org/server/listen.c httpd-2.0.52/server/listen.c ap_log_perror(APLOG_MARK, APLOG_CRIT, status, process->pool, "alloc_listener: failed to get a socket for %s", addr); diff -ur httpd-2.0.52.org/server/main.c httpd-2.0.52/server/main.c ---- httpd-2.0.52.org/server/main.c 2004-10-01 01:16:29.748377567 +0200 -+++ httpd-2.0.52/server/main.c 2004-10-01 01:17:32.569919525 +0200 +--- httpd-2.0.52.org/server/main.c 2004-10-02 18:25:57.292941087 +0200 ++++ httpd-2.0.52/server/main.c 2004-10-02 18:26:13.673431951 +0200 @@ -238,7 +238,7 @@ apr_pool_tag(process->pconf, "pconf"); process->argc = argc; @@ -1130,8 +1169,8 @@ diff -ur httpd-2.0.52.org/server/main.c httpd-2.0.52/server/main.c } diff -ur httpd-2.0.52.org/server/mpm/experimental/metuxmpm/metuxmpm.c httpd-2.0.52/server/mpm/experimental/metuxmpm/metuxmpm.c ---- httpd-2.0.52.org/server/mpm/experimental/metuxmpm/metuxmpm.c 2004-10-01 01:16:29.694389132 +0200 -+++ httpd-2.0.52/server/mpm/experimental/metuxmpm/metuxmpm.c 2004-10-01 01:17:32.561921238 +0200 +--- httpd-2.0.52.org/server/mpm/experimental/metuxmpm/metuxmpm.c 2004-10-02 18:25:57.241952010 +0200 ++++ httpd-2.0.52/server/mpm/experimental/metuxmpm/metuxmpm.c 2004-10-02 18:26:13.678430880 +0200 @@ -819,7 +819,7 @@ if (workers_may_exit) return APR_SUCCESS; @@ -1197,8 +1236,8 @@ diff -ur httpd-2.0.52.org/server/mpm/experimental/metuxmpm/metuxmpm.c httpd-2.0. /* handled */ #endif diff -ur httpd-2.0.52.org/server/mpm/experimental/perchild/perchild.c httpd-2.0.52/server/mpm/experimental/perchild/perchild.c ---- httpd-2.0.52.org/server/mpm/experimental/perchild/perchild.c 2004-10-01 01:16:29.688390417 +0200 -+++ httpd-2.0.52/server/mpm/experimental/perchild/perchild.c 2004-10-01 01:17:32.724886327 +0200 +--- httpd-2.0.52.org/server/mpm/experimental/perchild/perchild.c 2004-10-02 18:25:57.234953509 +0200 ++++ httpd-2.0.52/server/mpm/experimental/perchild/perchild.c 2004-10-02 18:26:13.682430023 +0200 @@ -552,7 +552,7 @@ char pipe_read_char; apr_size_t n = 1; @@ -1257,8 +1296,8 @@ diff -ur httpd-2.0.52.org/server/mpm/experimental/perchild/perchild.c httpd-2.0. #endif } diff -ur httpd-2.0.52.org/server/mpm/experimental/peruser/peruser.c httpd-2.0.52/server/mpm/experimental/peruser/peruser.c ---- httpd-2.0.52.org/server/mpm/experimental/peruser/peruser.c 2004-10-01 01:16:29.712385277 +0200 -+++ httpd-2.0.52/server/mpm/experimental/peruser/peruser.c 2004-10-01 01:17:32.720887183 +0200 +--- httpd-2.0.52.org/server/mpm/experimental/peruser/peruser.c 2004-10-02 18:25:57.245951153 +0200 ++++ httpd-2.0.52/server/mpm/experimental/peruser/peruser.c 2004-10-02 18:26:13.687428952 +0200 @@ -625,7 +625,7 @@ if (die_now) return APR_SUCCESS; @@ -1278,8 +1317,8 @@ diff -ur httpd-2.0.52.org/server/mpm/experimental/peruser/peruser.c httpd-2.0.52 /* handled */ #endif diff -ur httpd-2.0.52.org/server/mpm/prefork/prefork.c httpd-2.0.52/server/mpm/prefork/prefork.c ---- httpd-2.0.52.org/server/mpm/prefork/prefork.c 2004-10-01 01:16:29.731381208 +0200 -+++ httpd-2.0.52/server/mpm/prefork/prefork.c 2004-10-01 01:17:32.727885684 +0200 +--- httpd-2.0.52.org/server/mpm/prefork/prefork.c 2004-10-02 18:25:57.273945156 +0200 ++++ httpd-2.0.52/server/mpm/prefork/prefork.c 2004-10-02 18:26:13.691428095 +0200 @@ -1002,7 +1002,7 @@ } #if APR_HAS_OTHER_CHILD @@ -1290,8 +1329,8 @@ diff -ur httpd-2.0.52.org/server/mpm/prefork/prefork.c httpd-2.0.52/server/mpm/p #endif } diff -ur httpd-2.0.52.org/server/mpm/worker/pod.c httpd-2.0.52/server/mpm/worker/pod.c ---- httpd-2.0.52.org/server/mpm/worker/pod.c 2004-10-01 01:16:29.713385063 +0200 -+++ httpd-2.0.52/server/mpm/worker/pod.c 2004-10-01 01:17:32.729885256 +0200 +--- httpd-2.0.52.org/server/mpm/worker/pod.c 2004-10-02 18:25:57.245951153 +0200 ++++ httpd-2.0.52/server/mpm/worker/pod.c 2004-10-02 18:26:13.693427667 +0200 @@ -34,8 +34,8 @@ (*pod)->p = p; @@ -1304,8 +1343,8 @@ diff -ur httpd-2.0.52.org/server/mpm/worker/pod.c httpd-2.0.52/server/mpm/worker return APR_SUCCESS; } diff -ur httpd-2.0.52.org/server/mpm/worker/worker.c httpd-2.0.52/server/mpm/worker/worker.c ---- httpd-2.0.52.org/server/mpm/worker/worker.c 2004-10-01 01:16:29.715384635 +0200 -+++ httpd-2.0.52/server/mpm/worker/worker.c 2004-10-01 01:17:32.733884399 +0200 +--- httpd-2.0.52.org/server/mpm/worker/worker.c 2004-10-02 18:25:57.269946013 +0200 ++++ httpd-2.0.52/server/mpm/worker/worker.c 2004-10-02 18:26:13.697426810 +0200 @@ -578,13 +578,19 @@ apr_pollfd_t *pollset; apr_status_t rv; @@ -1352,8 +1391,8 @@ diff -ur httpd-2.0.52.org/server/mpm/worker/worker.c httpd-2.0.52/server/mpm/wor #endif } diff -ur httpd-2.0.52.org/server/mpm_common.c httpd-2.0.52/server/mpm_common.c ---- httpd-2.0.52.org/server/mpm_common.c 2004-10-01 01:16:29.734380565 +0200 -+++ httpd-2.0.52/server/mpm_common.c 2004-10-01 01:17:32.589915241 +0200 +--- httpd-2.0.52.org/server/mpm_common.c 2004-10-02 18:25:57.275944728 +0200 ++++ httpd-2.0.52/server/mpm_common.c 2004-10-02 18:26:13.700426168 +0200 @@ -150,7 +150,7 @@ } @@ -1393,8 +1432,8 @@ diff -ur httpd-2.0.52.org/server/mpm_common.c httpd-2.0.52/server/mpm_common.c int log_level = APLOG_WARNING; diff -ur httpd-2.0.52.org/server/protocol.c httpd-2.0.52/server/protocol.c ---- httpd-2.0.52.org/server/protocol.c 2004-10-01 01:16:29.735380351 +0200 -+++ httpd-2.0.52/server/protocol.c 2004-10-01 01:17:32.592914598 +0200 +--- httpd-2.0.52.org/server/protocol.c 2004-10-02 18:25:57.276944514 +0200 ++++ httpd-2.0.52/server/protocol.c 2004-10-02 18:26:13.704425311 +0200 @@ -223,7 +223,7 @@ return APR_EGENERAL; } @@ -1405,8 +1444,8 @@ diff -ur httpd-2.0.52.org/server/protocol.c httpd-2.0.52/server/protocol.c apr_size_t len; diff -ur httpd-2.0.52.org/server/request.c httpd-2.0.52/server/request.c ---- httpd-2.0.52.org/server/request.c 2004-10-01 01:16:29.738379708 +0200 -+++ httpd-2.0.52/server/request.c 2004-10-01 01:17:32.601912671 +0200 +--- httpd-2.0.52.org/server/request.c 2004-10-02 18:25:57.281943443 +0200 ++++ httpd-2.0.52/server/request.c 2004-10-02 18:26:13.709424240 +0200 @@ -375,7 +375,7 @@ * owner of the symlink, then get the info of the target. */ @@ -1486,8 +1525,8 @@ diff -ur httpd-2.0.52.org/server/request.c httpd-2.0.52/server/request.c rnew->finfo.filetype = 0; } diff -ur httpd-2.0.52.org/server/rfc1413.c httpd-2.0.52/server/rfc1413.c ---- httpd-2.0.52.org/server/rfc1413.c 2004-10-01 01:16:29.733380779 +0200 -+++ httpd-2.0.52/server/rfc1413.c 2004-10-01 01:17:32.586915883 +0200 +--- httpd-2.0.52.org/server/rfc1413.c 2004-10-02 18:25:57.274944942 +0200 ++++ httpd-2.0.52/server/rfc1413.c 2004-10-02 18:26:13.712423598 +0200 @@ -98,7 +98,7 @@ if ((rv = apr_socket_create(newsock, @@ -1545,8 +1584,8 @@ diff -ur httpd-2.0.52.org/server/rfc1413.c httpd-2.0.52/server/rfc1413.c ap_log_error(APLOG_MARK, APLOG_CRIT, status, srv, "read: rfc1413: error reading response"); diff -ur httpd-2.0.52.org/server/util.c httpd-2.0.52/server/util.c ---- httpd-2.0.52.org/server/util.c 2004-10-01 01:16:29.741379066 +0200 -+++ httpd-2.0.52/server/util.c 2004-10-01 01:17:32.584916312 +0200 +--- httpd-2.0.52.org/server/util.c 2004-10-02 18:25:57.284942800 +0200 ++++ httpd-2.0.52/server/util.c 2004-10-02 18:26:13.716422741 +0200 @@ -1916,7 +1916,7 @@ { apr_finfo_t finfo; @@ -1556,10 +1595,9 @@ diff -ur httpd-2.0.52.org/server/util.c httpd-2.0.52/server/util.c return 0; /* in error condition, just return no */ return (finfo.filetype == APR_DIR); -Tylko w httpd-2.0.52/server: util.c.orig diff -ur httpd-2.0.52.org/server/util_filter.c httpd-2.0.52/server/util_filter.c ---- httpd-2.0.52.org/server/util_filter.c 2004-10-01 01:16:29.737379923 +0200 -+++ httpd-2.0.52/server/util_filter.c 2004-10-01 01:17:32.597913528 +0200 +--- httpd-2.0.52.org/server/util_filter.c 2004-10-02 18:25:57.280943657 +0200 ++++ httpd-2.0.52/server/util_filter.c 2004-10-02 18:26:13.719422098 +0200 @@ -527,7 +527,7 @@ *saveto = apr_brigade_create(p, f->c->bucket_alloc); } @@ -1570,8 +1608,8 @@ diff -ur httpd-2.0.52.org/server/util_filter.c httpd-2.0.52/server/util_filter.c if (rv != APR_SUCCESS /* ### this ENOTIMPL will go away once we implement setaside diff -ur httpd-2.0.52.org/server/util_md5.c httpd-2.0.52/server/util_md5.c ---- httpd-2.0.52.org/server/util_md5.c 2004-10-01 01:16:29.750377138 +0200 -+++ httpd-2.0.52/server/util_md5.c 2004-10-01 01:17:32.570919310 +0200 +--- httpd-2.0.52.org/server/util_md5.c 2004-10-02 18:25:57.294940658 +0200 ++++ httpd-2.0.52/server/util_md5.c 2004-10-02 18:26:13.721421670 +0200 @@ -53,8 +53,8 @@ { const char *hex = "0123456789abcdef"; @@ -1600,8 +1638,8 @@ diff -ur httpd-2.0.52.org/server/util_md5.c httpd-2.0.52/server/util_md5.c AP_DECLARE(char *) ap_md5(apr_pool_t *p, const unsigned char *string) diff -ur httpd-2.0.52.org/server/util_script.c httpd-2.0.52/server/util_script.c ---- httpd-2.0.52.org/server/util_script.c 2004-10-01 01:16:29.747377781 +0200 -+++ httpd-2.0.52/server/util_script.c 2004-10-01 01:17:32.567919953 +0200 +--- httpd-2.0.52.org/server/util_script.c 2004-10-02 18:25:57.291941301 +0200 ++++ httpd-2.0.52/server/util_script.c 2004-10-02 18:26:13.812402180 +0200 @@ -236,7 +236,7 @@ apr_table_addn(e, "SERVER_ADMIN", s->server_admin); /* Apache */ apr_table_addn(e, "SCRIPT_FILENAME", r->filename); /* Apache */ @@ -1639,8 +1677,8 @@ diff -ur httpd-2.0.52.org/server/util_script.c httpd-2.0.52/server/util_script.c } src = bucket_data; diff -ur httpd-2.0.52.org/server/util_time.c httpd-2.0.52/server/util_time.c ---- httpd-2.0.52.org/server/util_time.c 2004-10-01 01:16:29.739379494 +0200 -+++ httpd-2.0.52/server/util_time.c 2004-10-01 01:17:32.604912028 +0200 +--- httpd-2.0.52.org/server/util_time.c 2004-10-02 18:25:57.282943228 +0200 ++++ httpd-2.0.52/server/util_time.c 2004-10-02 18:26:13.814401751 +0200 @@ -118,7 +118,7 @@ else { r = apr_time_exp_lt(xt, t); @@ -1651,8 +1689,8 @@ diff -ur httpd-2.0.52.org/server/util_time.c httpd-2.0.52/server/util_time.c } cache_element->t = seconds; diff -ur httpd-2.0.52.org/server/util_xml.c httpd-2.0.52/server/util_xml.c ---- httpd-2.0.52.org/server/util_xml.c 2004-10-01 01:16:29.740379280 +0200 -+++ httpd-2.0.52/server/util_xml.c 2004-10-01 01:17:32.594914170 +0200 +--- httpd-2.0.52.org/server/util_xml.c 2004-10-02 18:25:57.283943014 +0200 ++++ httpd-2.0.52/server/util_xml.c 2004-10-02 18:26:13.817401109 +0200 @@ -56,7 +56,7 @@ goto read_error; } @@ -1663,8 +1701,8 @@ diff -ur httpd-2.0.52.org/server/util_xml.c httpd-2.0.52/server/util_xml.c apr_size_t len; diff -ur httpd-2.0.52.org/server/vhost.c httpd-2.0.52/server/vhost.c ---- httpd-2.0.52.org/server/vhost.c 2004-10-01 01:16:29.742378852 +0200 -+++ httpd-2.0.52/server/vhost.c 2004-10-01 01:17:32.607911386 +0200 +--- httpd-2.0.52.org/server/vhost.c 2004-10-02 18:25:57.285942586 +0200 ++++ httpd-2.0.52/server/vhost.c 2004-10-02 18:26:13.883386973 +0200 @@ -873,7 +873,7 @@ last_s = NULL; @@ -1693,8 +1731,8 @@ diff -ur httpd-2.0.52.org/server/vhost.c httpd-2.0.52/server/vhost.c trav = find_default_server(port); if (trav) { diff -ur httpd-2.0.52.org/support/ab.c httpd-2.0.52/support/ab.c ---- httpd-2.0.52.org/support/ab.c 2004-10-01 01:16:32.364817056 +0200 -+++ httpd-2.0.52/support/ab.c 2004-10-01 01:17:32.620908601 +0200 +--- httpd-2.0.52.org/support/ab.c 2004-10-02 18:25:58.481686426 +0200 ++++ httpd-2.0.52/support/ab.c 2004-10-02 18:26:13.888385902 +0200 @@ -721,7 +721,7 @@ } else @@ -1774,8 +1812,8 @@ diff -ur httpd-2.0.52.org/support/ab.c httpd-2.0.52/support/ab.c c->state = STATE_UNCONNECTED; start_connect(c); diff -ur httpd-2.0.52.org/support/Makefile.in httpd-2.0.52/support/Makefile.in ---- httpd-2.0.52.org/support/Makefile.in 2004-10-01 01:16:32.535780431 +0200 -+++ httpd-2.0.52/support/Makefile.in 2004-10-01 01:17:32.616909458 +0200 +--- httpd-2.0.52.org/support/Makefile.in 2004-10-02 18:25:58.494683641 +0200 ++++ httpd-2.0.52/support/Makefile.in 2004-10-02 18:26:13.890385473 +0200 @@ -51,7 +51,7 @@ ab_OBJECTS = ab.lo -- 2.44.0