You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2009/10/04 00:02:14 UTC
svn commit: r21 [2/2] - in /release/httpd: ./ binaries/netware/
binaries/reliantunix/ binaries/rpm/ binaries/solaris/ binaries/win32/
binaries/win32/patches_applied/ binaries/win32/symbols/ docs/ flood/
libapreq/ mod_fcgid/ mod_ftp/ modpython/ modpytho...
Propchange: release/httpd/patches/apply_to_1.2.3/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.2.3/mod_proxy_fix_3.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.2.4/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.2.4/no2slash-loop-fix.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.2.6/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.0/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.0/ftp_size_mod_proxy.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.3.0/win32_mod_rewrite.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.3.1/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.11/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.12/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.14/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.17/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.19/HEADER.html
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.19/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.19/fixfault_win32_os2-1.3.19.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.3.19/os2/HEADER.html
('svn:mime-type' removed)
Modified: release/httpd/patches/apply_to_1.3.19/win32/ApacheCore.dll.asc
==============================================================================
--- release/httpd/patches/apply_to_1.3.19/win32/ApacheCore.dll.asc (original)
+++ release/httpd/patches/apply_to_1.3.19/win32/ApacheCore.dll.asc Sat Oct 3 18:02:09 2009
@@ -1,11 +1,11 @@
------BEGIN PGP SIGNATURE-----
-Version: PGP 6.5.8
-
-iQEVAwUAOvwz3fcTqHkQ/eB1AQFV4wgAlu15U0k2NB8qQqV0iJPRGWIWRkNPoK0L
-R0drVDlCIKoPHrJJGYnG7FG7TGKkDOvOMKbGuH06U2DNttwpxh1cPfzg0Ropzf6V
-i6C4RWRts+xhjK5JFwarHFQX1Smq0zcvFyslJuXYzbgvE9tyuBtgDqy39KpS/3wl
-xkbfImZE8fPdWIU1VOtVewcPgc9GEjHVNMfe9BMSFWwwi+RLrXZc0gQiwZS68jUU
-AArPHqOKyBwGrFCRyEczxRR7Gj+ZtZGnHKHTMvvThA1PnDWnXCnnYbyrLfGRZ02N
-0p5NroK/JASFq51AAJ7b0uLtFISeN44z8Rd0iAH3bTT+hV972m5GDg==
-=Ecxb
------END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: PGP 6.5.8
+
+iQEVAwUAOvwz3fcTqHkQ/eB1AQFV4wgAlu15U0k2NB8qQqV0iJPRGWIWRkNPoK0L
+R0drVDlCIKoPHrJJGYnG7FG7TGKkDOvOMKbGuH06U2DNttwpxh1cPfzg0Ropzf6V
+i6C4RWRts+xhjK5JFwarHFQX1Smq0zcvFyslJuXYzbgvE9tyuBtgDqy39KpS/3wl
+xkbfImZE8fPdWIU1VOtVewcPgc9GEjHVNMfe9BMSFWwwi+RLrXZc0gQiwZS68jUU
+AArPHqOKyBwGrFCRyEczxRR7Gj+ZtZGnHKHTMvvThA1PnDWnXCnnYbyrLfGRZ02N
+0p5NroK/JASFq51AAJ7b0uLtFISeN44z8Rd0iAH3bTT+hV972m5GDg==
+=Ecxb
+-----END PGP SIGNATURE-----
Propchange: release/httpd/patches/apply_to_1.3.19/win32/ApacheCore.dll.asc
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.3.19/win32/HEADER.html
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.2/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.2/core_404_log_bug.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.2/htaccess_check.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.20/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.22/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.23/solaris-apache-1.3.23.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.3.24/proxy_http1.1_chunking.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.3.26/README.html
('svn:mime-type' removed)
Modified: release/httpd/patches/apply_to_1.3.26/nw_http_main.patch
==============================================================================
--- release/httpd/patches/apply_to_1.3.26/nw_http_main.patch (original)
+++ release/httpd/patches/apply_to_1.3.26/nw_http_main.patch Sat Oct 3 18:02:09 2009
@@ -1,11 +1,11 @@
---- http_main.c Tue Jun 18 17:25:26 2002
-+++ \projects\apache_1.3.25\src\main\http_main.c Tue Jun 04 22:53:16 2002
-@@ -7260,7 +7260,7 @@
-
- while ((c = getopt(argc, argv, "D:C:c:Xd:f:vVlLz:Z:wiuStThk:n:W:")) != -1) {
- #else /* !WIN32 */
-- while ((c = getopt(argc, argv, "D:C:c:Xd:Ff:vVlLesStTh")) != -1) {
-+ while ((c = getopt(argc, argv, "D:C:c:Xd:fF:vVlLesStTh")) != -1) {
- #endif
- char **new;
- switch (c) {
+--- http_main.c Tue Jun 18 17:25:26 2002
++++ \projects\apache_1.3.25\src\main\http_main.c Tue Jun 04 22:53:16 2002
+@@ -7260,7 +7260,7 @@
+
+ while ((c = getopt(argc, argv, "D:C:c:Xd:f:vVlLz:Z:wiuStThk:n:W:")) != -1) {
+ #else /* !WIN32 */
+- while ((c = getopt(argc, argv, "D:C:c:Xd:Ff:vVlLesStTh")) != -1) {
++ while ((c = getopt(argc, argv, "D:C:c:Xd:fF:vVlLesStTh")) != -1) {
+ #endif
+ char **new;
+ switch (c) {
Propchange: release/httpd/patches/apply_to_1.3.26/nw_http_main.patch
------------------------------------------------------------------------------
svn:eol-style = native
Modified: release/httpd/patches/apply_to_1.3.26/nw_mod_rewrite.patch
==============================================================================
--- release/httpd/patches/apply_to_1.3.26/nw_mod_rewrite.patch (original)
+++ release/httpd/patches/apply_to_1.3.26/nw_mod_rewrite.patch Sat Oct 3 18:02:09 2009
@@ -1,61 +1,61 @@
---- mod_rewrite.c Mon Jul 08 11:20:36 2002
-+++ mod_rewrite.c.patch Mon Jul 08 11:03:18 2002
-@@ -99,6 +99,11 @@
- #include <sys/uio.h>
- #endif
-
-+#ifdef NETWARE
-+#include <nwsemaph.h>
-+static LONG locking_sem = 0;
-+#endif
-+
- /*
- ** +-------------------------------------------------------+
- ** | |
-@@ -3261,6 +3266,10 @@
- chown(lockname, ap_user_id, -1 /* no gid change */);
- #endif
-
-+#ifdef NETWARE
-+ locking_sem = OpenLocalSemaphore (1);
-+#endif
-+
- return;
- }
-
-@@ -3293,6 +3302,10 @@
- unlink(lockname);
- lockname = NULL;
- lockfd = -1;
-+#ifdef NETWARE
-+ CloseLocalSemaphore (locking_sem);
-+#endif
-+
- }
-
- static void rewritelock_alloc(request_rec *r)
-@@ -4140,6 +4153,12 @@
- rc = _locking(fd, _LK_LOCK, 1);
- lseek(fd, 0, SEEK_END);
- #endif
-+#ifdef NETWARE
-+ if ((locking_sem != 0) && (TimedWaitOnLocalSemaphore (locking_sem, 10000) != 0))
-+ rc = -1;
-+ else
-+ rc = 1;
-+#endif
-
- if (rc < 0) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
-@@ -4169,6 +4188,11 @@
- lseek(fd, 0, SEEK_SET);
- rc = _locking(fd, _LK_UNLCK, 1);
- lseek(fd, 0, SEEK_END);
-+#endif
-+#ifdef NETWARE
-+ if (locking_sem)
-+ SignalLocalSemaphore (locking_sem);
-+ rc = 1;
- #endif
-
- if (rc < 0) {
+--- mod_rewrite.c Mon Jul 08 11:20:36 2002
++++ mod_rewrite.c.patch Mon Jul 08 11:03:18 2002
+@@ -99,6 +99,11 @@
+ #include <sys/uio.h>
+ #endif
+
++#ifdef NETWARE
++#include <nwsemaph.h>
++static LONG locking_sem = 0;
++#endif
++
+ /*
+ ** +-------------------------------------------------------+
+ ** | |
+@@ -3261,6 +3266,10 @@
+ chown(lockname, ap_user_id, -1 /* no gid change */);
+ #endif
+
++#ifdef NETWARE
++ locking_sem = OpenLocalSemaphore (1);
++#endif
++
+ return;
+ }
+
+@@ -3293,6 +3302,10 @@
+ unlink(lockname);
+ lockname = NULL;
+ lockfd = -1;
++#ifdef NETWARE
++ CloseLocalSemaphore (locking_sem);
++#endif
++
+ }
+
+ static void rewritelock_alloc(request_rec *r)
+@@ -4140,6 +4153,12 @@
+ rc = _locking(fd, _LK_LOCK, 1);
+ lseek(fd, 0, SEEK_END);
+ #endif
++#ifdef NETWARE
++ if ((locking_sem != 0) && (TimedWaitOnLocalSemaphore (locking_sem, 10000) != 0))
++ rc = -1;
++ else
++ rc = 1;
++#endif
+
+ if (rc < 0) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
+@@ -4169,6 +4188,11 @@
+ lseek(fd, 0, SEEK_SET);
+ rc = _locking(fd, _LK_UNLCK, 1);
+ lseek(fd, 0, SEEK_END);
++#endif
++#ifdef NETWARE
++ if (locking_sem)
++ SignalLocalSemaphore (locking_sem);
++ rc = 1;
+ #endif
+
+ if (rc < 0) {
Propchange: release/httpd/patches/apply_to_1.3.26/nw_mod_rewrite.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.3.27/README.html
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.27/aix.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.3.28/README.html
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.28/no_zombies.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.3.3/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.3/core_404_log_bug.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.3/proxy_segv.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.3/server_error_filename.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.31/CAN-2004-0492.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.3.31/PR-29257.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.3.31/README.html
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.4/LimitExcept.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.4/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.4/negotiation_and_etags.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.6/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.9/SECURITY_chunk_size_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_1.3.9/apxs-osf-dso.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.3b3/no2slash-loop-fix.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.3b5/PR1847.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.3b5/PR1850.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_1.3b5/PR1889.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.28/errordoc.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.32/cc.default.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.32/htdbm.ebcdic.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.32/instdso.os390.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.32/lib.os390.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.35/README.html
('svn:mime-type' removed)
Modified: release/httpd/patches/apply_to_2.0.35/netware_mpm.patch
==============================================================================
--- release/httpd/patches/apply_to_2.0.35/netware_mpm.patch (original)
+++ release/httpd/patches/apply_to_2.0.35/netware_mpm.patch Sat Oct 3 18:02:09 2009
@@ -1,57 +1,57 @@
---- httpd\server\mpm\netware\mpm_netware.c Fri Apr 05 17:00:20 2002
-+++ httpd-2.0.35\server\mpm\netware\mpm_netware.c Tue Apr 02 10:25:24 2002
-@@ -204,10 +204,9 @@
- #endif
-
- /* a clean exit from a child with proper cleanup */
--static void clean_child_exit(int code, int worker_num, apr_bucket_alloc_t *bucket_alloc) __attribute__ ((noreturn));
--static void clean_child_exit(int code, int worker_num, apr_bucket_alloc_t *bucket_alloc)
-+static void clean_child_exit(int code, int worker_num) __attribute__ ((noreturn));
-+static void clean_child_exit(int code, int worker_num)
- {
-- apr_bucket_alloc_destroy(bucket_alloc);
- apr_thread_mutex_lock(worker_thread_count_mutex);
- worker_thread_count--;
- apr_thread_mutex_unlock(worker_thread_count_mutex);
-@@ -396,7 +395,7 @@
-
- if ((ap_max_requests_per_child > 0
- && requests_this_child++ >= ap_max_requests_per_child)) {
-- clean_child_exit(0, my_worker_num, bucket_alloc);
-+ clean_child_exit(0, my_worker_num);
- }
-
- ap_update_child_status_from_indexes(0, my_worker_num, WORKER_READY,
-@@ -413,7 +412,7 @@
- if (shutdown_pending || restart_pending || (ap_scoreboard_image->servers[0][my_worker_num].status == WORKER_IDLE_KILL)) {
- DBPRINT1 ("\nThread slot %d is shutting down\n", my_worker_num);
- apr_thread_mutex_unlock(accept_mutex);
-- clean_child_exit(0, my_worker_num, bucket_alloc);
-+ clean_child_exit(0, my_worker_num);
- }
-
- /* If we just satisfied a request on listen port x, assume that more
-@@ -518,12 +517,12 @@
- */
- ap_log_error(APLOG_MARK, APLOG_EMERG, stat, ap_server_conf,
- "apr_accept: giving up.");
-- clean_child_exit(APEXIT_CHILDFATAL, my_worker_num, bucket_alloc);
-+ clean_child_exit(APEXIT_CHILDFATAL, my_worker_num);
-
- default:
- ap_log_error(APLOG_MARK, APLOG_ERR, stat, ap_server_conf,
- "apr_accept: (client socket)");
-- clean_child_exit(1, my_worker_num, bucket_alloc);
-+ clean_child_exit(1, my_worker_num);
- }
- }
- }
-@@ -545,7 +544,7 @@
- }
- request_count++;
- }
-- clean_child_exit(0, my_worker_num, bucket_alloc);
-+ clean_child_exit(0, my_worker_num);
- }
-
-
+--- httpd\server\mpm\netware\mpm_netware.c Fri Apr 05 17:00:20 2002
++++ httpd-2.0.35\server\mpm\netware\mpm_netware.c Tue Apr 02 10:25:24 2002
+@@ -204,10 +204,9 @@
+ #endif
+
+ /* a clean exit from a child with proper cleanup */
+-static void clean_child_exit(int code, int worker_num, apr_bucket_alloc_t *bucket_alloc) __attribute__ ((noreturn));
+-static void clean_child_exit(int code, int worker_num, apr_bucket_alloc_t *bucket_alloc)
++static void clean_child_exit(int code, int worker_num) __attribute__ ((noreturn));
++static void clean_child_exit(int code, int worker_num)
+ {
+- apr_bucket_alloc_destroy(bucket_alloc);
+ apr_thread_mutex_lock(worker_thread_count_mutex);
+ worker_thread_count--;
+ apr_thread_mutex_unlock(worker_thread_count_mutex);
+@@ -396,7 +395,7 @@
+
+ if ((ap_max_requests_per_child > 0
+ && requests_this_child++ >= ap_max_requests_per_child)) {
+- clean_child_exit(0, my_worker_num, bucket_alloc);
++ clean_child_exit(0, my_worker_num);
+ }
+
+ ap_update_child_status_from_indexes(0, my_worker_num, WORKER_READY,
+@@ -413,7 +412,7 @@
+ if (shutdown_pending || restart_pending || (ap_scoreboard_image->servers[0][my_worker_num].status == WORKER_IDLE_KILL)) {
+ DBPRINT1 ("\nThread slot %d is shutting down\n", my_worker_num);
+ apr_thread_mutex_unlock(accept_mutex);
+- clean_child_exit(0, my_worker_num, bucket_alloc);
++ clean_child_exit(0, my_worker_num);
+ }
+
+ /* If we just satisfied a request on listen port x, assume that more
+@@ -518,12 +517,12 @@
+ */
+ ap_log_error(APLOG_MARK, APLOG_EMERG, stat, ap_server_conf,
+ "apr_accept: giving up.");
+- clean_child_exit(APEXIT_CHILDFATAL, my_worker_num, bucket_alloc);
++ clean_child_exit(APEXIT_CHILDFATAL, my_worker_num);
+
+ default:
+ ap_log_error(APLOG_MARK, APLOG_ERR, stat, ap_server_conf,
+ "apr_accept: (client socket)");
+- clean_child_exit(1, my_worker_num, bucket_alloc);
++ clean_child_exit(1, my_worker_num);
+ }
+ }
+ }
+@@ -545,7 +544,7 @@
+ }
+ request_count++;
+ }
+- clean_child_exit(0, my_worker_num, bucket_alloc);
++ clean_child_exit(0, my_worker_num);
+ }
+
+
Propchange: release/httpd/patches/apply_to_2.0.35/netware_mpm.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.35/osx_libtool.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.35/var_exports.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.36/README.html
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_2.0.36/osx_libtool.patch
------------------------------------------------------------------------------
svn:eol-style = native
Modified: release/httpd/patches/apply_to_2.0.36/security_rollup.patch
==============================================================================
--- release/httpd/patches/apply_to_2.0.36/security_rollup.patch (original)
+++ release/httpd/patches/apply_to_2.0.36/security_rollup.patch Sat Oct 3 18:02:09 2009
@@ -1,209 +1,209 @@
-Index: include/http_log.h
-===================================================================
-RCS file: /home/cvs/httpd-2.0/include/http_log.h,v
-retrieving revision 1.35
-diff -u -r1.35 http_log.h
---- include/http_log.h 22 Apr 2002 03:25:40 -0000 1.35
-+++ include/http_log.h 9 Aug 2002 16:32:53 -0000
-@@ -107,7 +107,7 @@
- /* Use APLOG_TOCLIENT to cause ap_log_rerror() to send the message
- * to the client in addition to recording it to the error log.
- */
--#define APLOG_TOCLIENT (APLOG_LEVELMASK + 2)
-+#define APLOG_TOCLIENT ((APLOG_LEVELMASK + 1) * 2)
-
- /* normal but significant condition on startup, usually printed to stderr */
- #define APLOG_STARTUP ((APLOG_LEVELMASK + 1) * 4)
-Index: modules/generators/mod_cgi.c
-===================================================================
-RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.c,v
-retrieving revision 1.134
-diff -u -r1.134 mod_cgi.c
---- modules/generators/mod_cgi.c 22 Apr 2002 08:08:37 -0000 1.134
-+++ modules/generators/mod_cgi.c 9 Aug 2002 16:32:56 -0000
-@@ -477,8 +477,9 @@
-
- if (rc != APR_SUCCESS) {
- /* Bad things happened. Everyone should have cleaned up. */
-- ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
-- "couldn't create child process: %d: %s", rc, r->filename);
-+ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rc, r,
-+ "couldn't create child process: %d: %s", rc,
-+ apr_filename_of_pathname(r->filename));
- }
- else {
- apr_pool_note_subprocess(p, procnew, APR_KILL_AFTER_TIMEOUT);
-Index: modules/generators/mod_cgid.c
-===================================================================
-RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgid.c,v
-retrieving revision 1.128
-diff -u -r1.128 mod_cgid.c
---- modules/generators/mod_cgid.c 22 Apr 2002 08:08:38 -0000 1.128
-+++ modules/generators/mod_cgid.c 9 Aug 2002 16:32:59 -0000
-@@ -644,8 +644,9 @@
-
- if (rc != APR_SUCCESS) {
- /* Bad things happened. Everyone should have cleaned up. */
-- ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
-- "couldn't create child process: %d: %s", rc, r->filename);
-+ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rc, r,
-+ "couldn't create child process: %d: %s", rc,
-+ apr_filename_of_pathname(r->filename));
- }
- }
- }
-Index: modules/mappers/mod_negotiation.c
-===================================================================
-RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_negotiation.c,v
-retrieving revision 1.101
-diff -u -r1.101 mod_negotiation.c
---- modules/mappers/mod_negotiation.c 29 Mar 2002 08:17:23 -0000 1.101
-+++ modules/mappers/mod_negotiation.c 9 Aug 2002 16:33:05 -0000
-@@ -984,7 +984,7 @@
- break;
- }
- mime_info.bytes = len;
-- mime_info.file_name = rr->filename;
-+ mime_info.file_name = apr_filename_of_pathname(rr->filename);
- }
- }
- else {
-@@ -1048,15 +1048,15 @@
-
- clean_var_rec(&mime_info);
-
-- if (!(filp = strrchr(r->filename, '/'))) {
-- return DECLINED; /* Weird... */
-+ if (r->proxyreq || !r->filename
-+ || !ap_os_is_path_absolute(neg->pool, r->filename)) {
-+ return DECLINED;
- }
-
-- /* XXX this should be more general, and quit using 'specials' */
-- if (strncmp(r->filename, "proxy:", 6) == 0) {
-+ /* Only absolute paths here */
-+ if (!(filp = strrchr(r->filename, '/'))) {
- return DECLINED;
- }
--
- ++filp;
- prefix_len = strlen(filp);
-
-@@ -2685,8 +2685,15 @@
- * non-neighboring variant. We can have a non-neighboring
- * variant when processing a type map.
- */
-- if (ap_strchr_c(variant->file_name, '/'))
-+ if (ap_strchr(variant->file_name, '/'))
-+ neg->is_transparent = 0;
-+
-+ /* We can't be transparent, because of the behavior
-+ * of variant typemap bodies.
-+ */
-+ if (variant->body) {
- neg->is_transparent = 0;
-+ }
- }
- }
-
-@@ -2818,9 +2825,6 @@
- apr_bucket *e;
-
- ap_allow_standard_methods(r, REPLACE_ALLOW, M_GET, M_OPTIONS, M_POST, -1);
-- if ((res = ap_discard_request_body(r)) != OK) {
-- return res;
-- }
- /*if (r->method_number == M_OPTIONS) {
- * return ap_send_http_options(r);
- *}
-@@ -2841,6 +2845,9 @@
- return res;
- }
-
-+ if ((res = ap_discard_request_body(r)) != OK) {
-+ return res;
-+ }
- bb = apr_brigade_create(r->pool, c->bucket_alloc);
- e = apr_bucket_file_create(map, best->body,
- (apr_size_t)best->bytes, r->pool,
-Index: server/util.c
-===================================================================
-RCS file: /home/cvs/httpd-2.0/server/util.c,v
-retrieving revision 1.127
-diff -u -r1.127 util.c
---- server/util.c 29 Apr 2002 07:20:46 -0000 1.127
-+++ server/util.c 9 Aug 2002 16:33:10 -0000
-@@ -115,6 +115,16 @@
- */
- #define TEST_CHAR(c, f) (test_char_table[(unsigned)(c)] & (f))
-
-+/* Win32/NetWare/OS2 need to check for both forward and back slashes
-+ * in ap_getparents() and ap_escape_url.
-+ */
-+#ifdef CASE_BLIND_FILESYSTEM
-+#define IS_SLASH(s) ((s == '/') || (s == '\\'))
-+#else
-+#define IS_SLASH(s) (s == '/')
-+#endif
-+
-+
- /*
- * Examine a field value (such as a media-/content-type) string and return
- * it sans any parameters; e.g., strip off any ';charset=foo' and the like.
-@@ -485,7 +495,7 @@
- }
- l = w = first_dot = next - name;
- while (name[l] != '\0') {
-- if (name[l] == '.' && name[l + 1] == '/' && (l == 0 || name[l - 1] == '/'))
-+ if (name[l] == '.' && IS_SLASH(name[l + 1]) && (l == 0 || IS_SLASH(name[l - 1])))
- l += 2;
- else
- name[w++] = name[l++];
-@@ -494,7 +504,7 @@
- /* b) remove trailing . path, segment */
- if (w == 1 && name[0] == '.')
- w--;
-- else if (w > 1 && name[w - 1] == '.' && name[w - 2] == '/')
-+ else if (w > 1 && name[w - 1] == '.' && IS_SLASH(name[w - 2]))
- w--;
- name[w] = '\0';
-
-@@ -502,13 +512,13 @@
- l = first_dot;
-
- while (name[l] != '\0') {
-- if (name[l] == '.' && name[l + 1] == '.' && name[l + 2] == '/' &&
-- (l == 0 || name[l - 1] == '/')) {
-+ if (name[l] == '.' && name[l + 1] == '.' && IS_SLASH(name[l + 2]) &&
-+ (l == 0 || IS_SLASH(name[l - 1]))) {
- register int m = l + 3, n;
-
- l = l - 2;
- if (l >= 0) {
-- while (l >= 0 && name[l] != '/')
-+ while (l >= 0 && !IS_SLASH(name[l]))
- l--;
- l++;
- }
-@@ -525,10 +535,10 @@
- /* d) remove trailing xx/.. segment. */
- if (l == 2 && name[0] == '.' && name[1] == '.')
- name[0] = '\0';
-- else if (l > 2 && name[l - 1] == '.' && name[l - 2] == '.' && name[l - 3] == '/') {
-+ else if (l > 2 && name[l - 1] == '.' && name[l - 2] == '.' && IS_SLASH(name[l - 3])) {
- l = l - 4;
- if (l >= 0) {
-- while (l >= 0 && name[l] != '/')
-+ while (l >= 0 && !IS_SLASH(name[l]))
- l--;
- l++;
- }
-@@ -1547,7 +1557,7 @@
- else {
- *x = x2c(y + 1);
- y += 2;
-- if (*x == '/' || *x == '\0')
-+ if (IS_SLASH(*x) || *x == '\0')
- badpath = 1;
- }
- }
+Index: include/http_log.h
+===================================================================
+RCS file: /home/cvs/httpd-2.0/include/http_log.h,v
+retrieving revision 1.35
+diff -u -r1.35 http_log.h
+--- include/http_log.h 22 Apr 2002 03:25:40 -0000 1.35
++++ include/http_log.h 9 Aug 2002 16:32:53 -0000
+@@ -107,7 +107,7 @@
+ /* Use APLOG_TOCLIENT to cause ap_log_rerror() to send the message
+ * to the client in addition to recording it to the error log.
+ */
+-#define APLOG_TOCLIENT (APLOG_LEVELMASK + 2)
++#define APLOG_TOCLIENT ((APLOG_LEVELMASK + 1) * 2)
+
+ /* normal but significant condition on startup, usually printed to stderr */
+ #define APLOG_STARTUP ((APLOG_LEVELMASK + 1) * 4)
+Index: modules/generators/mod_cgi.c
+===================================================================
+RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.c,v
+retrieving revision 1.134
+diff -u -r1.134 mod_cgi.c
+--- modules/generators/mod_cgi.c 22 Apr 2002 08:08:37 -0000 1.134
++++ modules/generators/mod_cgi.c 9 Aug 2002 16:32:56 -0000
+@@ -477,8 +477,9 @@
+
+ if (rc != APR_SUCCESS) {
+ /* Bad things happened. Everyone should have cleaned up. */
+- ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
+- "couldn't create child process: %d: %s", rc, r->filename);
++ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rc, r,
++ "couldn't create child process: %d: %s", rc,
++ apr_filename_of_pathname(r->filename));
+ }
+ else {
+ apr_pool_note_subprocess(p, procnew, APR_KILL_AFTER_TIMEOUT);
+Index: modules/generators/mod_cgid.c
+===================================================================
+RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgid.c,v
+retrieving revision 1.128
+diff -u -r1.128 mod_cgid.c
+--- modules/generators/mod_cgid.c 22 Apr 2002 08:08:38 -0000 1.128
++++ modules/generators/mod_cgid.c 9 Aug 2002 16:32:59 -0000
+@@ -644,8 +644,9 @@
+
+ if (rc != APR_SUCCESS) {
+ /* Bad things happened. Everyone should have cleaned up. */
+- ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
+- "couldn't create child process: %d: %s", rc, r->filename);
++ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rc, r,
++ "couldn't create child process: %d: %s", rc,
++ apr_filename_of_pathname(r->filename));
+ }
+ }
+ }
+Index: modules/mappers/mod_negotiation.c
+===================================================================
+RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_negotiation.c,v
+retrieving revision 1.101
+diff -u -r1.101 mod_negotiation.c
+--- modules/mappers/mod_negotiation.c 29 Mar 2002 08:17:23 -0000 1.101
++++ modules/mappers/mod_negotiation.c 9 Aug 2002 16:33:05 -0000
+@@ -984,7 +984,7 @@
+ break;
+ }
+ mime_info.bytes = len;
+- mime_info.file_name = rr->filename;
++ mime_info.file_name = apr_filename_of_pathname(rr->filename);
+ }
+ }
+ else {
+@@ -1048,15 +1048,15 @@
+
+ clean_var_rec(&mime_info);
+
+- if (!(filp = strrchr(r->filename, '/'))) {
+- return DECLINED; /* Weird... */
++ if (r->proxyreq || !r->filename
++ || !ap_os_is_path_absolute(neg->pool, r->filename)) {
++ return DECLINED;
+ }
+
+- /* XXX this should be more general, and quit using 'specials' */
+- if (strncmp(r->filename, "proxy:", 6) == 0) {
++ /* Only absolute paths here */
++ if (!(filp = strrchr(r->filename, '/'))) {
+ return DECLINED;
+ }
+-
+ ++filp;
+ prefix_len = strlen(filp);
+
+@@ -2685,8 +2685,15 @@
+ * non-neighboring variant. We can have a non-neighboring
+ * variant when processing a type map.
+ */
+- if (ap_strchr_c(variant->file_name, '/'))
++ if (ap_strchr(variant->file_name, '/'))
++ neg->is_transparent = 0;
++
++ /* We can't be transparent, because of the behavior
++ * of variant typemap bodies.
++ */
++ if (variant->body) {
+ neg->is_transparent = 0;
++ }
+ }
+ }
+
+@@ -2818,9 +2825,6 @@
+ apr_bucket *e;
+
+ ap_allow_standard_methods(r, REPLACE_ALLOW, M_GET, M_OPTIONS, M_POST, -1);
+- if ((res = ap_discard_request_body(r)) != OK) {
+- return res;
+- }
+ /*if (r->method_number == M_OPTIONS) {
+ * return ap_send_http_options(r);
+ *}
+@@ -2841,6 +2845,9 @@
+ return res;
+ }
+
++ if ((res = ap_discard_request_body(r)) != OK) {
++ return res;
++ }
+ bb = apr_brigade_create(r->pool, c->bucket_alloc);
+ e = apr_bucket_file_create(map, best->body,
+ (apr_size_t)best->bytes, r->pool,
+Index: server/util.c
+===================================================================
+RCS file: /home/cvs/httpd-2.0/server/util.c,v
+retrieving revision 1.127
+diff -u -r1.127 util.c
+--- server/util.c 29 Apr 2002 07:20:46 -0000 1.127
++++ server/util.c 9 Aug 2002 16:33:10 -0000
+@@ -115,6 +115,16 @@
+ */
+ #define TEST_CHAR(c, f) (test_char_table[(unsigned)(c)] & (f))
+
++/* Win32/NetWare/OS2 need to check for both forward and back slashes
++ * in ap_getparents() and ap_escape_url.
++ */
++#ifdef CASE_BLIND_FILESYSTEM
++#define IS_SLASH(s) ((s == '/') || (s == '\\'))
++#else
++#define IS_SLASH(s) (s == '/')
++#endif
++
++
+ /*
+ * Examine a field value (such as a media-/content-type) string and return
+ * it sans any parameters; e.g., strip off any ';charset=foo' and the like.
+@@ -485,7 +495,7 @@
+ }
+ l = w = first_dot = next - name;
+ while (name[l] != '\0') {
+- if (name[l] == '.' && name[l + 1] == '/' && (l == 0 || name[l - 1] == '/'))
++ if (name[l] == '.' && IS_SLASH(name[l + 1]) && (l == 0 || IS_SLASH(name[l - 1])))
+ l += 2;
+ else
+ name[w++] = name[l++];
+@@ -494,7 +504,7 @@
+ /* b) remove trailing . path, segment */
+ if (w == 1 && name[0] == '.')
+ w--;
+- else if (w > 1 && name[w - 1] == '.' && name[w - 2] == '/')
++ else if (w > 1 && name[w - 1] == '.' && IS_SLASH(name[w - 2]))
+ w--;
+ name[w] = '\0';
+
+@@ -502,13 +512,13 @@
+ l = first_dot;
+
+ while (name[l] != '\0') {
+- if (name[l] == '.' && name[l + 1] == '.' && name[l + 2] == '/' &&
+- (l == 0 || name[l - 1] == '/')) {
++ if (name[l] == '.' && name[l + 1] == '.' && IS_SLASH(name[l + 2]) &&
++ (l == 0 || IS_SLASH(name[l - 1]))) {
+ register int m = l + 3, n;
+
+ l = l - 2;
+ if (l >= 0) {
+- while (l >= 0 && name[l] != '/')
++ while (l >= 0 && !IS_SLASH(name[l]))
+ l--;
+ l++;
+ }
+@@ -525,10 +535,10 @@
+ /* d) remove trailing xx/.. segment. */
+ if (l == 2 && name[0] == '.' && name[1] == '.')
+ name[0] = '\0';
+- else if (l > 2 && name[l - 1] == '.' && name[l - 2] == '.' && name[l - 3] == '/') {
++ else if (l > 2 && name[l - 1] == '.' && name[l - 2] == '.' && IS_SLASH(name[l - 3])) {
+ l = l - 4;
+ if (l >= 0) {
+- while (l >= 0 && name[l] != '/')
++ while (l >= 0 && !IS_SLASH(name[l]))
+ l--;
+ l++;
+ }
+@@ -1547,7 +1557,7 @@
+ else {
+ *x = x2c(y + 1);
+ y += 2;
+- if (*x == '/' || *x == '\0')
++ if (IS_SLASH(*x) || *x == '\0')
+ badpath = 1;
+ }
+ }
Propchange: release/httpd/patches/apply_to_2.0.36/security_rollup.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.39/README.html
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_2.0.39/htpasswd-c-and-n-options-conflict.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.39/htpasswd-overwrites-old-file.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.39/osx_libtool.patch
------------------------------------------------------------------------------
svn:eol-style = native
Modified: release/httpd/patches/apply_to_2.0.39/security_rollup.patch
==============================================================================
--- release/httpd/patches/apply_to_2.0.39/security_rollup.patch (original)
+++ release/httpd/patches/apply_to_2.0.39/security_rollup.patch Sat Oct 3 18:02:09 2009
@@ -1,209 +1,209 @@
-Index: include/http_log.h
-===================================================================
-RCS file: /home/cvs/httpd-2.0/include/http_log.h,v
-retrieving revision 1.38
-diff -u -r1.38 http_log.h
---- include/http_log.h 4 Jun 2002 19:01:05 -0000 1.38
-+++ include/http_log.h 9 Aug 2002 16:34:02 -0000
-@@ -119,7 +119,7 @@
- * Note: Client generated text streams sent back to the client MUST
- * be escaped to prevent CSS attacks.
- */
--#define APLOG_TOCLIENT (APLOG_LEVELMASK + 2)
-+#define APLOG_TOCLIENT ((APLOG_LEVELMASK + 1) * 2)
-
- /* normal but significant condition on startup, usually printed to stderr */
- #define APLOG_STARTUP ((APLOG_LEVELMASK + 1) * 4)
-Index: modules/generators/mod_cgi.c
-===================================================================
-RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.c,v
-retrieving revision 1.143
-diff -u -r1.143 mod_cgi.c
---- modules/generators/mod_cgi.c 13 Jun 2002 06:36:40 -0000 1.143
-+++ modules/generators/mod_cgi.c 9 Aug 2002 16:34:06 -0000
-@@ -480,9 +480,9 @@
-
- if (rc != APR_SUCCESS) {
- /* Bad things happened. Everyone should have cleaned up. */
-- ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
-+ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rc, r,
- "couldn't create child process: %d: %s", rc,
-- r->filename);
-+ apr_filename_of_pathname(r->filename));
- }
- else {
- apr_pool_note_subprocess(p, procnew, APR_KILL_AFTER_TIMEOUT);
-Index: modules/generators/mod_cgid.c
-===================================================================
-RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgid.c,v
-retrieving revision 1.137
-diff -u -r1.137 mod_cgid.c
---- modules/generators/mod_cgid.c 13 Jun 2002 19:41:17 -0000 1.137
-+++ modules/generators/mod_cgid.c 9 Aug 2002 16:34:09 -0000
-@@ -653,8 +653,9 @@
-
- if (rc != APR_SUCCESS) {
- /* Bad things happened. Everyone should have cleaned up. */
-- ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
-- "couldn't create child process: %d: %s", rc, r->filename);
-+ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rc, r,
-+ "couldn't create child process: %d: %s", rc,
-+ apr_filename_of_pathname(r->filename));
- }
- }
- }
-Index: modules/mappers/mod_negotiation.c
-===================================================================
-RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_negotiation.c,v
-retrieving revision 1.102
-diff -u -r1.102 mod_negotiation.c
---- modules/mappers/mod_negotiation.c 17 May 2002 11:24:16 -0000 1.102
-+++ modules/mappers/mod_negotiation.c 9 Aug 2002 16:34:15 -0000
-@@ -984,7 +984,7 @@
- break;
- }
- mime_info.bytes = len;
-- mime_info.file_name = rr->filename;
-+ mime_info.file_name = apr_filename_of_pathname(rr->filename);
- }
- }
- else {
-@@ -1048,15 +1048,15 @@
-
- clean_var_rec(&mime_info);
-
-- if (!(filp = strrchr(r->filename, '/'))) {
-- return DECLINED; /* Weird... */
-+ if (r->proxyreq || !r->filename
-+ || !ap_os_is_path_absolute(neg->pool, r->filename)) {
-+ return DECLINED;
- }
-
-- /* XXX this should be more general, and quit using 'specials' */
-- if (strncmp(r->filename, "proxy:", 6) == 0) {
-+ /* Only absolute paths here */
-+ if (!(filp = strrchr(r->filename, '/'))) {
- return DECLINED;
- }
--
- ++filp;
- prefix_len = strlen(filp);
-
-@@ -2685,8 +2685,15 @@
- * non-neighboring variant. We can have a non-neighboring
- * variant when processing a type map.
- */
-- if (ap_strchr_c(variant->file_name, '/'))
-+ if (ap_strchr(variant->file_name, '/'))
-+ neg->is_transparent = 0;
-+
-+ /* We can't be transparent, because of the behavior
-+ * of variant typemap bodies.
-+ */
-+ if (variant->body) {
- neg->is_transparent = 0;
-+ }
- }
- }
-
-@@ -2818,9 +2825,6 @@
- apr_bucket *e;
-
- ap_allow_standard_methods(r, REPLACE_ALLOW, M_GET, M_OPTIONS, M_POST, -1);
-- if ((res = ap_discard_request_body(r)) != OK) {
-- return res;
-- }
- /*if (r->method_number == M_OPTIONS) {
- * return ap_send_http_options(r);
- *}
-@@ -2841,6 +2845,9 @@
- return res;
- }
-
-+ if ((res = ap_discard_request_body(r)) != OK) {
-+ return res;
-+ }
- bb = apr_brigade_create(r->pool, c->bucket_alloc);
- e = apr_bucket_file_create(map, best->body,
- (apr_size_t)best->bytes, r->pool,
-Index: server/util.c
-===================================================================
-RCS file: /home/cvs/httpd-2.0/server/util.c,v
-retrieving revision 1.128
-diff -u -r1.128 util.c
---- server/util.c 17 May 2002 11:11:37 -0000 1.128
-+++ server/util.c 9 Aug 2002 16:34:19 -0000
-@@ -115,6 +115,16 @@
- */
- #define TEST_CHAR(c, f) (test_char_table[(unsigned)(c)] & (f))
-
-+/* Win32/NetWare/OS2 need to check for both forward and back slashes
-+ * in ap_getparents() and ap_escape_url.
-+ */
-+#ifdef CASE_BLIND_FILESYSTEM
-+#define IS_SLASH(s) ((s == '/') || (s == '\\'))
-+#else
-+#define IS_SLASH(s) (s == '/')
-+#endif
-+
-+
- /*
- * Examine a field value (such as a media-/content-type) string and return
- * it sans any parameters; e.g., strip off any ';charset=foo' and the like.
-@@ -485,7 +495,7 @@
- }
- l = w = first_dot = next - name;
- while (name[l] != '\0') {
-- if (name[l] == '.' && name[l + 1] == '/' && (l == 0 || name[l - 1] == '/'))
-+ if (name[l] == '.' && IS_SLASH(name[l + 1]) && (l == 0 || IS_SLASH(name[l - 1])))
- l += 2;
- else
- name[w++] = name[l++];
-@@ -494,7 +504,7 @@
- /* b) remove trailing . path, segment */
- if (w == 1 && name[0] == '.')
- w--;
-- else if (w > 1 && name[w - 1] == '.' && name[w - 2] == '/')
-+ else if (w > 1 && name[w - 1] == '.' && IS_SLASH(name[w - 2]))
- w--;
- name[w] = '\0';
-
-@@ -502,13 +512,13 @@
- l = first_dot;
-
- while (name[l] != '\0') {
-- if (name[l] == '.' && name[l + 1] == '.' && name[l + 2] == '/' &&
-- (l == 0 || name[l - 1] == '/')) {
-+ if (name[l] == '.' && name[l + 1] == '.' && IS_SLASH(name[l + 2]) &&
-+ (l == 0 || IS_SLASH(name[l - 1]))) {
- register int m = l + 3, n;
-
- l = l - 2;
- if (l >= 0) {
-- while (l >= 0 && name[l] != '/')
-+ while (l >= 0 && !IS_SLASH(name[l]))
- l--;
- l++;
- }
-@@ -525,10 +535,10 @@
- /* d) remove trailing xx/.. segment. */
- if (l == 2 && name[0] == '.' && name[1] == '.')
- name[0] = '\0';
-- else if (l > 2 && name[l - 1] == '.' && name[l - 2] == '.' && name[l - 3] == '/') {
-+ else if (l > 2 && name[l - 1] == '.' && name[l - 2] == '.' && IS_SLASH(name[l - 3])) {
- l = l - 4;
- if (l >= 0) {
-- while (l >= 0 && name[l] != '/')
-+ while (l >= 0 && !IS_SLASH(name[l]))
- l--;
- l++;
- }
-@@ -1547,7 +1557,7 @@
- else {
- *x = x2c(y + 1);
- y += 2;
-- if (*x == '/' || *x == '\0')
-+ if (IS_SLASH(*x) || *x == '\0')
- badpath = 1;
- }
- }
+Index: include/http_log.h
+===================================================================
+RCS file: /home/cvs/httpd-2.0/include/http_log.h,v
+retrieving revision 1.38
+diff -u -r1.38 http_log.h
+--- include/http_log.h 4 Jun 2002 19:01:05 -0000 1.38
++++ include/http_log.h 9 Aug 2002 16:34:02 -0000
+@@ -119,7 +119,7 @@
+ * Note: Client generated text streams sent back to the client MUST
+ * be escaped to prevent CSS attacks.
+ */
+-#define APLOG_TOCLIENT (APLOG_LEVELMASK + 2)
++#define APLOG_TOCLIENT ((APLOG_LEVELMASK + 1) * 2)
+
+ /* normal but significant condition on startup, usually printed to stderr */
+ #define APLOG_STARTUP ((APLOG_LEVELMASK + 1) * 4)
+Index: modules/generators/mod_cgi.c
+===================================================================
+RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.c,v
+retrieving revision 1.143
+diff -u -r1.143 mod_cgi.c
+--- modules/generators/mod_cgi.c 13 Jun 2002 06:36:40 -0000 1.143
++++ modules/generators/mod_cgi.c 9 Aug 2002 16:34:06 -0000
+@@ -480,9 +480,9 @@
+
+ if (rc != APR_SUCCESS) {
+ /* Bad things happened. Everyone should have cleaned up. */
+- ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
++ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rc, r,
+ "couldn't create child process: %d: %s", rc,
+- r->filename);
++ apr_filename_of_pathname(r->filename));
+ }
+ else {
+ apr_pool_note_subprocess(p, procnew, APR_KILL_AFTER_TIMEOUT);
+Index: modules/generators/mod_cgid.c
+===================================================================
+RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgid.c,v
+retrieving revision 1.137
+diff -u -r1.137 mod_cgid.c
+--- modules/generators/mod_cgid.c 13 Jun 2002 19:41:17 -0000 1.137
++++ modules/generators/mod_cgid.c 9 Aug 2002 16:34:09 -0000
+@@ -653,8 +653,9 @@
+
+ if (rc != APR_SUCCESS) {
+ /* Bad things happened. Everyone should have cleaned up. */
+- ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
+- "couldn't create child process: %d: %s", rc, r->filename);
++ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rc, r,
++ "couldn't create child process: %d: %s", rc,
++ apr_filename_of_pathname(r->filename));
+ }
+ }
+ }
+Index: modules/mappers/mod_negotiation.c
+===================================================================
+RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_negotiation.c,v
+retrieving revision 1.102
+diff -u -r1.102 mod_negotiation.c
+--- modules/mappers/mod_negotiation.c 17 May 2002 11:24:16 -0000 1.102
++++ modules/mappers/mod_negotiation.c 9 Aug 2002 16:34:15 -0000
+@@ -984,7 +984,7 @@
+ break;
+ }
+ mime_info.bytes = len;
+- mime_info.file_name = rr->filename;
++ mime_info.file_name = apr_filename_of_pathname(rr->filename);
+ }
+ }
+ else {
+@@ -1048,15 +1048,15 @@
+
+ clean_var_rec(&mime_info);
+
+- if (!(filp = strrchr(r->filename, '/'))) {
+- return DECLINED; /* Weird... */
++ if (r->proxyreq || !r->filename
++ || !ap_os_is_path_absolute(neg->pool, r->filename)) {
++ return DECLINED;
+ }
+
+- /* XXX this should be more general, and quit using 'specials' */
+- if (strncmp(r->filename, "proxy:", 6) == 0) {
++ /* Only absolute paths here */
++ if (!(filp = strrchr(r->filename, '/'))) {
+ return DECLINED;
+ }
+-
+ ++filp;
+ prefix_len = strlen(filp);
+
+@@ -2685,8 +2685,15 @@
+ * non-neighboring variant. We can have a non-neighboring
+ * variant when processing a type map.
+ */
+- if (ap_strchr_c(variant->file_name, '/'))
++ if (ap_strchr(variant->file_name, '/'))
++ neg->is_transparent = 0;
++
++ /* We can't be transparent, because of the behavior
++ * of variant typemap bodies.
++ */
++ if (variant->body) {
+ neg->is_transparent = 0;
++ }
+ }
+ }
+
+@@ -2818,9 +2825,6 @@
+ apr_bucket *e;
+
+ ap_allow_standard_methods(r, REPLACE_ALLOW, M_GET, M_OPTIONS, M_POST, -1);
+- if ((res = ap_discard_request_body(r)) != OK) {
+- return res;
+- }
+ /*if (r->method_number == M_OPTIONS) {
+ * return ap_send_http_options(r);
+ *}
+@@ -2841,6 +2845,9 @@
+ return res;
+ }
+
++ if ((res = ap_discard_request_body(r)) != OK) {
++ return res;
++ }
+ bb = apr_brigade_create(r->pool, c->bucket_alloc);
+ e = apr_bucket_file_create(map, best->body,
+ (apr_size_t)best->bytes, r->pool,
+Index: server/util.c
+===================================================================
+RCS file: /home/cvs/httpd-2.0/server/util.c,v
+retrieving revision 1.128
+diff -u -r1.128 util.c
+--- server/util.c 17 May 2002 11:11:37 -0000 1.128
++++ server/util.c 9 Aug 2002 16:34:19 -0000
+@@ -115,6 +115,16 @@
+ */
+ #define TEST_CHAR(c, f) (test_char_table[(unsigned)(c)] & (f))
+
++/* Win32/NetWare/OS2 need to check for both forward and back slashes
++ * in ap_getparents() and ap_escape_url.
++ */
++#ifdef CASE_BLIND_FILESYSTEM
++#define IS_SLASH(s) ((s == '/') || (s == '\\'))
++#else
++#define IS_SLASH(s) (s == '/')
++#endif
++
++
+ /*
+ * Examine a field value (such as a media-/content-type) string and return
+ * it sans any parameters; e.g., strip off any ';charset=foo' and the like.
+@@ -485,7 +495,7 @@
+ }
+ l = w = first_dot = next - name;
+ while (name[l] != '\0') {
+- if (name[l] == '.' && name[l + 1] == '/' && (l == 0 || name[l - 1] == '/'))
++ if (name[l] == '.' && IS_SLASH(name[l + 1]) && (l == 0 || IS_SLASH(name[l - 1])))
+ l += 2;
+ else
+ name[w++] = name[l++];
+@@ -494,7 +504,7 @@
+ /* b) remove trailing . path, segment */
+ if (w == 1 && name[0] == '.')
+ w--;
+- else if (w > 1 && name[w - 1] == '.' && name[w - 2] == '/')
++ else if (w > 1 && name[w - 1] == '.' && IS_SLASH(name[w - 2]))
+ w--;
+ name[w] = '\0';
+
+@@ -502,13 +512,13 @@
+ l = first_dot;
+
+ while (name[l] != '\0') {
+- if (name[l] == '.' && name[l + 1] == '.' && name[l + 2] == '/' &&
+- (l == 0 || name[l - 1] == '/')) {
++ if (name[l] == '.' && name[l + 1] == '.' && IS_SLASH(name[l + 2]) &&
++ (l == 0 || IS_SLASH(name[l - 1]))) {
+ register int m = l + 3, n;
+
+ l = l - 2;
+ if (l >= 0) {
+- while (l >= 0 && name[l] != '/')
++ while (l >= 0 && !IS_SLASH(name[l]))
+ l--;
+ l++;
+ }
+@@ -525,10 +535,10 @@
+ /* d) remove trailing xx/.. segment. */
+ if (l == 2 && name[0] == '.' && name[1] == '.')
+ name[0] = '\0';
+- else if (l > 2 && name[l - 1] == '.' && name[l - 2] == '.' && name[l - 3] == '/') {
++ else if (l > 2 && name[l - 1] == '.' && name[l - 2] == '.' && IS_SLASH(name[l - 3])) {
+ l = l - 4;
+ if (l >= 0) {
+- while (l >= 0 && name[l] != '/')
++ while (l >= 0 && !IS_SLASH(name[l]))
+ l--;
+ l++;
+ }
+@@ -1547,7 +1557,7 @@
+ else {
+ *x = x2c(y + 1);
+ y += 2;
+- if (*x == '/' || *x == '\0')
++ if (IS_SLASH(*x) || *x == '\0')
+ badpath = 1;
+ }
+ }
Propchange: release/httpd/patches/apply_to_2.0.39/security_rollup.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.40/README.html
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_2.0.40/aprutil-install.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_2.0.40/ebcdic_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_2.0.40/openssl_autoselect_patch.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_2.0.40/openssl_autoselect_patch.txt.asc
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.40/osx_libtool.patch
------------------------------------------------------------------------------
svn:eol-style = native
Modified: release/httpd/patches/apply_to_2.0.40/win32-enable-apr-iconv.patch
==============================================================================
--- release/httpd/patches/apply_to_2.0.40/win32-enable-apr-iconv.patch (original)
+++ release/httpd/patches/apply_to_2.0.40/win32-enable-apr-iconv.patch Sat Oct 3 18:02:09 2009
@@ -1,216 +1,216 @@
-Index: Apache.dsw
-===================================================================
-RCS file: /home/cvs/httpd-2.0/Apache.dsw,v
-retrieving revision 1.85
-diff -u -r1.85 Apache.dsw
---- Apache.dsw 9 Aug 2002 15:01:45 -0000 1.85
-+++ Apache.dsw 9 Aug 2002 15:02:58 -0000
-@@ -90,6 +90,9 @@
- Project_Dep_Name mod_cgi
- End Project Dependency
- Begin Project Dependency
-+ Project_Dep_Name mod_charset_lite
-+ End Project Dependency
-+ Begin Project Dependency
- Project_Dep_Name mod_dav_fs
- End Project Dependency
- Begin Project Dependency
-@@ -261,6 +264,18 @@
-
- ###############################################################################
-
-+Project: "apriconv"=".\srclib\apr-iconv\apriconv.dsp" - Package Owner=<4>
-+
-+Package=<5>
-+{{{
-+}}}
-+
-+Package=<4>
-+{{{
-+}}}
-+
-+###############################################################################
-+
- Project: "aprutil"=".\srclib\apr-util\aprutil.dsp" - Package Owner=<4>
-
- Package=<5>
-@@ -270,6 +285,9 @@
- Package=<4>
- {{{
- Begin Project Dependency
-+ Project_Dep_Name apriconv
-+ End Project Dependency
-+ Begin Project Dependency
- Project_Dep_Name gen_uri_delims
- End Project Dependency
- Begin Project Dependency
-@@ -384,6 +402,21 @@
-
- ###############################################################################
-
-+Project: "libapriconv"=".\srclib\apr-iconv\libapriconv.dsp" - Package Owner=<4>
-+
-+Package=<5>
-+{{{
-+}}}
-+
-+Package=<4>
-+{{{
-+ Begin Project Dependency
-+ Project_Dep_Name libapr
-+ End Project Dependency
-+}}}
-+
-+###############################################################################
-+
- Project: "libaprutil"=".\srclib\apr-util\libaprutil.dsp" - Package Owner=<4>
-
- Package=<5>
-@@ -396,6 +429,9 @@
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
-+ Project_Dep_Name libapriconv
-+ End Project Dependency
-+ Begin Project Dependency
- Project_Dep_Name gen_uri_delims
- End Project Dependency
- Begin Project Dependency
-@@ -417,6 +453,9 @@
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
-+ Project_Dep_Name libapriconv
-+ End Project Dependency
-+ Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
- Begin Project Dependency
-@@ -679,6 +718,27 @@
- ###############################################################################
-
- Project: "mod_cgi"=".\modules\generators\mod_cgi.dsp" - Package Owner=<4>
-+
-+Package=<5>
-+{{{
-+}}}
-+
-+Package=<4>
-+{{{
-+ Begin Project Dependency
-+ Project_Dep_Name libapr
-+ End Project Dependency
-+ Begin Project Dependency
-+ Project_Dep_Name libaprutil
-+ End Project Dependency
-+ Begin Project Dependency
-+ Project_Dep_Name libhttpd
-+ End Project Dependency
-+}}}
-+
-+###############################################################################
-+
-+Project: "mod_charset_lite"=".\modules\experimental\mod_charset_lite.dsp" - Package Owner=<4>
-
- Package=<5>
- {{{
-Index: Makefile.win
-===================================================================
-RCS file: /home/cvs/httpd-2.0/Makefile.win,v
-retrieving revision 1.115
-diff -u -r1.115 Makefile.win
---- Makefile.win 9 Aug 2002 15:01:45 -0000 1.115
-+++ Makefile.win 9 Aug 2002 15:02:59 -0000
-@@ -31,13 +31,12 @@
- CTARGET=/build
- !ENDIF
-
--!IF !EXIST("srclib\apr") || !EXIST("srclib\apr-util")
--## || !EXIST("srclib\apr-iconv")
-+!IF !EXIST("srclib\apr") || !EXIST("srclib\apr-util") || !EXIST("srclib\apr-iconv")
- !MESSAGE Please check out or download and unpack the Apache Portability Runtime
--!MESSAGE sources (apr and apr-util) into your $(INSTDIR)\srclib dir.
-+!MESSAGE sources (apr, apr-iconv and apr-util) into your $(INSTDIR)\srclib dir.
- !MESSAGE Apache cannot build without these libraries!
- !MESSAGE
--!ERROR Need $(INSTDIR)\srclib\ apr and apr-util
-+!ERROR Need $(INSTDIR)\srclib\ apr, apr-iconv and apr-util
- !ENDIF
-
- # Note; _tryssl: is only used by the msvc developer studio environment to 'fix up'
-@@ -175,6 +174,10 @@
- $(MAKE) $(MAKEOPT) -f apr.mak CFG="apr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f libapr.mak CFG="libapr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- cd ..\..
-+ cd srclib\apr-iconv
-+ $(MAKE) $(MAKEOPT) -f apriconv.mak CFG="apriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-+ $(MAKE) $(MAKEOPT) -f libapriconv.mak CFG="libapriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-+ cd ..\..
- cd srclib\apr-util\uri
- $(MAKE) $(MAKEOPT) -f gen_uri_delims.mak CFG="gen_uri_delims - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- cd ..\..\..
-@@ -215,6 +218,7 @@
- cd ..\..\..
- cd modules\experimental
- $(MAKE) $(MAKEOPT) -f mod_cache.mak CFG="mod_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-+ $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_mem_cache.mak CFG="mod_mem_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_disk_cache.mak CFG="mod_disk_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-@@ -353,6 +357,7 @@
- copy $(LONG)\Apache.exe "$(INSTDIR)\bin" <.y
- copy $(LONG)\libhttpd.dll "$(INSTDIR)\bin" <.y
- copy srclib\apr\$(LONG)\libapr.dll "$(INSTDIR)\bin" <.y
-+ copy srclib\apr-iconv\$(LONG)\libapriconv.dll "$(INSTDIR)\bin" <.y
- copy srclib\apr-util\$(LONG)\libaprutil.dll "$(INSTDIR)\bin" <.y
- copy modules\aaa\$(LONG)\mod_access.so "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_auth.so "$(INSTDIR)\modules" <.y
-@@ -364,6 +369,7 @@
- copy modules\dav\fs\$(LONG)\mod_dav_fs.so "$(INSTDIR)\modules" <.y
- copy modules\dav\main\$(LONG)\mod_dav.so "$(INSTDIR)\modules" <.y
- copy modules\experimental\$(LONG)\mod_cache.so "$(INSTDIR)\modules" <.y
-+ copy modules\experimental\$(LONG)\mod_charset_lite.so "$(INSTDIR)\modules" <.y
- copy modules\experimental\$(LONG)\mod_mem_cache.so "$(INSTDIR)\modules" <.y
- copy modules\experimental\$(LONG)\mod_disk_cache.so "$(INSTDIR)\modules" <.y
- copy modules\experimental\$(LONG)\mod_ext_filter.so "$(INSTDIR)\modules" <.y
-@@ -400,6 +406,7 @@
- copy $(LONG)\Apache.pdb "$(INSTDIR)\bin" <.y
- copy $(LONG)\libhttpd.pdb "$(INSTDIR)\bin" <.y
- copy srclib\apr\$(LONG)\libapr.pdb "$(INSTDIR)\bin" <.y
-+ copy srclib\apr-iconv\$(LONG)\libapriconv.pdb "$(INSTDIR)\bin" <.y
- copy srclib\apr-util\$(LONG)\libaprutil.pdb "$(INSTDIR)\bin" <.y
- copy modules\aaa\$(LONG)\mod_access.pdb "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_auth.pdb "$(INSTDIR)\modules" <.y
-@@ -411,6 +418,7 @@
- copy modules\dav\fs\$(LONG)\mod_dav_fs.pdb "$(INSTDIR)\modules" <.y
- copy modules\dav\main\$(LONG)\mod_dav.pdb "$(INSTDIR)\modules" <.y
- copy modules\experimental\$(LONG)\mod_cache.pdb "$(INSTDIR)\modules" <.y
-+ copy modules\experimental\$(LONG)\mod_charset_lite.pdb "$(INSTDIR)\modules" <.y
- copy modules\experimental\$(LONG)\mod_mem_cache.pdb "$(INSTDIR)\modules" <.y
- copy modules\experimental\$(LONG)\mod_disk_cache.pdb "$(INSTDIR)\modules" <.y
- copy modules\experimental\$(LONG)\mod_ext_filter.pdb "$(INSTDIR)\modules" <.y
-@@ -603,6 +611,8 @@
- copy srclib\apr-util\xml\expat\lib\Lib$(SHORT)\xml.lib "$(INSTDIR)\lib\expat.lib" <.y
- copy srclib\apr\$(LONG)\libapr.lib "$(INSTDIR)\lib" <.y
- copy srclib\apr\$(LONG)\libapr.exp "$(INSTDIR)\lib" <.y
-+ copy srclib\apr-iconv\$(LONG)\libapriconv.lib "$(INSTDIR)\lib" <.y
-+ copy srclib\apr-iconv\$(LONG)\libapriconv.exp "$(INSTDIR)\lib" <.y
- copy srclib\apr-util\$(LONG)\libaprutil.lib "$(INSTDIR)\lib" <.y
- copy srclib\apr-util\$(LONG)\libaprutil.exp "$(INSTDIR)\lib" <.y
- copy $(LONG)\libhttpd.exp "$(INSTDIR)\lib" <.y
-Index: srclib/apr-util/include/apu.hw
-===================================================================
-RCS file: /home/cvs/apr-util/include/apu.hw,v
-retrieving revision 1.10
-diff -u -r1.10 apu.hw
---- srclib/apr-util/include/apu.hw 9 Aug 2002 15:01:45 -0000 1.10
-+++ srclib/apr-util/include/apu.hw 9 Aug 2002 15:03:06 -0000
-@@ -154,7 +154,7 @@
- #endif
- #endif
-
--#define APU_HAVE_APR_ICONV 0
-+#define APU_HAVE_APR_ICONV 1
- #define APU_HAVE_ICONV 0
- #define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
-
+Index: Apache.dsw
+===================================================================
+RCS file: /home/cvs/httpd-2.0/Apache.dsw,v
+retrieving revision 1.85
+diff -u -r1.85 Apache.dsw
+--- Apache.dsw 9 Aug 2002 15:01:45 -0000 1.85
++++ Apache.dsw 9 Aug 2002 15:02:58 -0000
+@@ -90,6 +90,9 @@
+ Project_Dep_Name mod_cgi
+ End Project Dependency
+ Begin Project Dependency
++ Project_Dep_Name mod_charset_lite
++ End Project Dependency
++ Begin Project Dependency
+ Project_Dep_Name mod_dav_fs
+ End Project Dependency
+ Begin Project Dependency
+@@ -261,6 +264,18 @@
+
+ ###############################################################################
+
++Project: "apriconv"=".\srclib\apr-iconv\apriconv.dsp" - Package Owner=<4>
++
++Package=<5>
++{{{
++}}}
++
++Package=<4>
++{{{
++}}}
++
++###############################################################################
++
+ Project: "aprutil"=".\srclib\apr-util\aprutil.dsp" - Package Owner=<4>
+
+ Package=<5>
+@@ -270,6 +285,9 @@
+ Package=<4>
+ {{{
+ Begin Project Dependency
++ Project_Dep_Name apriconv
++ End Project Dependency
++ Begin Project Dependency
+ Project_Dep_Name gen_uri_delims
+ End Project Dependency
+ Begin Project Dependency
+@@ -384,6 +402,21 @@
+
+ ###############################################################################
+
++Project: "libapriconv"=".\srclib\apr-iconv\libapriconv.dsp" - Package Owner=<4>
++
++Package=<5>
++{{{
++}}}
++
++Package=<4>
++{{{
++ Begin Project Dependency
++ Project_Dep_Name libapr
++ End Project Dependency
++}}}
++
++###############################################################################
++
+ Project: "libaprutil"=".\srclib\apr-util\libaprutil.dsp" - Package Owner=<4>
+
+ Package=<5>
+@@ -396,6 +429,9 @@
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
++ Project_Dep_Name libapriconv
++ End Project Dependency
++ Begin Project Dependency
+ Project_Dep_Name gen_uri_delims
+ End Project Dependency
+ Begin Project Dependency
+@@ -417,6 +453,9 @@
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
++ Project_Dep_Name libapriconv
++ End Project Dependency
++ Begin Project Dependency
+ Project_Dep_Name libaprutil
+ End Project Dependency
+ Begin Project Dependency
+@@ -679,6 +718,27 @@
+ ###############################################################################
+
+ Project: "mod_cgi"=".\modules\generators\mod_cgi.dsp" - Package Owner=<4>
++
++Package=<5>
++{{{
++}}}
++
++Package=<4>
++{{{
++ Begin Project Dependency
++ Project_Dep_Name libapr
++ End Project Dependency
++ Begin Project Dependency
++ Project_Dep_Name libaprutil
++ End Project Dependency
++ Begin Project Dependency
++ Project_Dep_Name libhttpd
++ End Project Dependency
++}}}
++
++###############################################################################
++
++Project: "mod_charset_lite"=".\modules\experimental\mod_charset_lite.dsp" - Package Owner=<4>
+
+ Package=<5>
+ {{{
+Index: Makefile.win
+===================================================================
+RCS file: /home/cvs/httpd-2.0/Makefile.win,v
+retrieving revision 1.115
+diff -u -r1.115 Makefile.win
+--- Makefile.win 9 Aug 2002 15:01:45 -0000 1.115
++++ Makefile.win 9 Aug 2002 15:02:59 -0000
+@@ -31,13 +31,12 @@
+ CTARGET=/build
+ !ENDIF
+
+-!IF !EXIST("srclib\apr") || !EXIST("srclib\apr-util")
+-## || !EXIST("srclib\apr-iconv")
++!IF !EXIST("srclib\apr") || !EXIST("srclib\apr-util") || !EXIST("srclib\apr-iconv")
+ !MESSAGE Please check out or download and unpack the Apache Portability Runtime
+-!MESSAGE sources (apr and apr-util) into your $(INSTDIR)\srclib dir.
++!MESSAGE sources (apr, apr-iconv and apr-util) into your $(INSTDIR)\srclib dir.
+ !MESSAGE Apache cannot build without these libraries!
+ !MESSAGE
+-!ERROR Need $(INSTDIR)\srclib\ apr and apr-util
++!ERROR Need $(INSTDIR)\srclib\ apr, apr-iconv and apr-util
+ !ENDIF
+
+ # Note; _tryssl: is only used by the msvc developer studio environment to 'fix up'
+@@ -175,6 +174,10 @@
+ $(MAKE) $(MAKEOPT) -f apr.mak CFG="apr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f libapr.mak CFG="libapr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..\..
++ cd srclib\apr-iconv
++ $(MAKE) $(MAKEOPT) -f apriconv.mak CFG="apriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)
++ $(MAKE) $(MAKEOPT) -f libapriconv.mak CFG="libapriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)
++ cd ..\..
+ cd srclib\apr-util\uri
+ $(MAKE) $(MAKEOPT) -f gen_uri_delims.mak CFG="gen_uri_delims - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..\..\..
+@@ -215,6 +218,7 @@
+ cd ..\..\..
+ cd modules\experimental
+ $(MAKE) $(MAKEOPT) -f mod_cache.mak CFG="mod_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
++ $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_mem_cache.mak CFG="mod_mem_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_disk_cache.mak CFG="mod_disk_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+@@ -353,6 +357,7 @@
+ copy $(LONG)\Apache.exe "$(INSTDIR)\bin" <.y
+ copy $(LONG)\libhttpd.dll "$(INSTDIR)\bin" <.y
+ copy srclib\apr\$(LONG)\libapr.dll "$(INSTDIR)\bin" <.y
++ copy srclib\apr-iconv\$(LONG)\libapriconv.dll "$(INSTDIR)\bin" <.y
+ copy srclib\apr-util\$(LONG)\libaprutil.dll "$(INSTDIR)\bin" <.y
+ copy modules\aaa\$(LONG)\mod_access.so "$(INSTDIR)\modules" <.y
+ copy modules\aaa\$(LONG)\mod_auth.so "$(INSTDIR)\modules" <.y
+@@ -364,6 +369,7 @@
+ copy modules\dav\fs\$(LONG)\mod_dav_fs.so "$(INSTDIR)\modules" <.y
+ copy modules\dav\main\$(LONG)\mod_dav.so "$(INSTDIR)\modules" <.y
+ copy modules\experimental\$(LONG)\mod_cache.so "$(INSTDIR)\modules" <.y
++ copy modules\experimental\$(LONG)\mod_charset_lite.so "$(INSTDIR)\modules" <.y
+ copy modules\experimental\$(LONG)\mod_mem_cache.so "$(INSTDIR)\modules" <.y
+ copy modules\experimental\$(LONG)\mod_disk_cache.so "$(INSTDIR)\modules" <.y
+ copy modules\experimental\$(LONG)\mod_ext_filter.so "$(INSTDIR)\modules" <.y
+@@ -400,6 +406,7 @@
+ copy $(LONG)\Apache.pdb "$(INSTDIR)\bin" <.y
+ copy $(LONG)\libhttpd.pdb "$(INSTDIR)\bin" <.y
+ copy srclib\apr\$(LONG)\libapr.pdb "$(INSTDIR)\bin" <.y
++ copy srclib\apr-iconv\$(LONG)\libapriconv.pdb "$(INSTDIR)\bin" <.y
+ copy srclib\apr-util\$(LONG)\libaprutil.pdb "$(INSTDIR)\bin" <.y
+ copy modules\aaa\$(LONG)\mod_access.pdb "$(INSTDIR)\modules" <.y
+ copy modules\aaa\$(LONG)\mod_auth.pdb "$(INSTDIR)\modules" <.y
+@@ -411,6 +418,7 @@
+ copy modules\dav\fs\$(LONG)\mod_dav_fs.pdb "$(INSTDIR)\modules" <.y
+ copy modules\dav\main\$(LONG)\mod_dav.pdb "$(INSTDIR)\modules" <.y
+ copy modules\experimental\$(LONG)\mod_cache.pdb "$(INSTDIR)\modules" <.y
++ copy modules\experimental\$(LONG)\mod_charset_lite.pdb "$(INSTDIR)\modules" <.y
+ copy modules\experimental\$(LONG)\mod_mem_cache.pdb "$(INSTDIR)\modules" <.y
+ copy modules\experimental\$(LONG)\mod_disk_cache.pdb "$(INSTDIR)\modules" <.y
+ copy modules\experimental\$(LONG)\mod_ext_filter.pdb "$(INSTDIR)\modules" <.y
+@@ -603,6 +611,8 @@
+ copy srclib\apr-util\xml\expat\lib\Lib$(SHORT)\xml.lib "$(INSTDIR)\lib\expat.lib" <.y
+ copy srclib\apr\$(LONG)\libapr.lib "$(INSTDIR)\lib" <.y
+ copy srclib\apr\$(LONG)\libapr.exp "$(INSTDIR)\lib" <.y
++ copy srclib\apr-iconv\$(LONG)\libapriconv.lib "$(INSTDIR)\lib" <.y
++ copy srclib\apr-iconv\$(LONG)\libapriconv.exp "$(INSTDIR)\lib" <.y
+ copy srclib\apr-util\$(LONG)\libaprutil.lib "$(INSTDIR)\lib" <.y
+ copy srclib\apr-util\$(LONG)\libaprutil.exp "$(INSTDIR)\lib" <.y
+ copy $(LONG)\libhttpd.exp "$(INSTDIR)\lib" <.y
+Index: srclib/apr-util/include/apu.hw
+===================================================================
+RCS file: /home/cvs/apr-util/include/apu.hw,v
+retrieving revision 1.10
+diff -u -r1.10 apu.hw
+--- srclib/apr-util/include/apu.hw 9 Aug 2002 15:01:45 -0000 1.10
++++ srclib/apr-util/include/apu.hw 9 Aug 2002 15:03:06 -0000
+@@ -154,7 +154,7 @@
+ #endif
+ #endif
+
+-#define APU_HAVE_APR_ICONV 0
++#define APU_HAVE_APR_ICONV 1
+ #define APU_HAVE_ICONV 0
+ #define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
+
Propchange: release/httpd/patches/apply_to_2.0.40/win32-enable-apr-iconv.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.42/escape_servername.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.43/README.html
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_2.0.44/denial_of_service_fix.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.45/README.html
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_2.0.45/layout.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.45/os2_filestat_security_fix.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.47/CAN-2004-0493.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.48/CAN-2004-0493.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.49/CAN-2004-0493.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.49/aix_xlc_optimization.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.50/CAN-2004-0747.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.50/CAN-2004-0748.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.50/CAN-2004-0751.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.50/CAN-2004-0786.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.50/CAN-2004-0809.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.51/CAN-2004-0811.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.52/README.html
('svn:mime-type' removed)
Modified: release/httpd/patches/apply_to_2.0.52/util_ldap_cache_mgr.c.patch
==============================================================================
--- release/httpd/patches/apply_to_2.0.52/util_ldap_cache_mgr.c.patch (original)
+++ release/httpd/patches/apply_to_2.0.52/util_ldap_cache_mgr.c.patch Sat Oct 3 18:02:09 2009
@@ -1,50 +1,50 @@
-Index: modules/experimental/util_ldap_cache_mgr.c
-===================================================================
-RCS file: /home/cvs/httpd-2.0/modules/experimental/Attic/util_ldap_cache_mgr.c,v
-retrieving revision 1.3.2.13
-diff -u -r1.3.2.13 util_ldap_cache_mgr.c
---- modules/experimental/util_ldap_cache_mgr.c 23 Sep 2004 16:55:37 -0000 1.3.2.13
-+++ modules/experimental/util_ldap_cache_mgr.c 24 Sep 2004 16:40:23 -0000
-@@ -173,7 +173,7 @@
- void util_ald_cache_purge(util_ald_cache_t *cache)
- {
- unsigned long i;
-- util_cache_node_t *p, *q;
-+ util_cache_node_t *p, *q, **pp;
- apr_time_t t;
-
- if (!cache)
-@@ -184,7 +184,8 @@
- cache->numpurges++;
-
- for (i=0; i < cache->size; ++i) {
-- p = cache->nodes[i];
-+ pp = cache->nodes + i;
-+ p = *pp;
- while (p != NULL) {
- if (p->add_time < cache->marktime) {
- q = p->next;
-@@ -192,10 +193,11 @@
- util_ald_free(cache, p);
- cache->numentries--;
- cache->npurged++;
-- p = q;
-+ p = *pp = q;
- }
- else {
-- p = p->next;
-+ pp = &(p->next);
-+ p = *pp;
- }
- }
- }
-@@ -687,6 +689,9 @@
- break;
- }
-
-+ }
-+ else {
-+ buf = "";
- }
- }
- else {
+Index: modules/experimental/util_ldap_cache_mgr.c
+===================================================================
+RCS file: /home/cvs/httpd-2.0/modules/experimental/Attic/util_ldap_cache_mgr.c,v
+retrieving revision 1.3.2.13
+diff -u -r1.3.2.13 util_ldap_cache_mgr.c
+--- modules/experimental/util_ldap_cache_mgr.c 23 Sep 2004 16:55:37 -0000 1.3.2.13
++++ modules/experimental/util_ldap_cache_mgr.c 24 Sep 2004 16:40:23 -0000
+@@ -173,7 +173,7 @@
+ void util_ald_cache_purge(util_ald_cache_t *cache)
+ {
+ unsigned long i;
+- util_cache_node_t *p, *q;
++ util_cache_node_t *p, *q, **pp;
+ apr_time_t t;
+
+ if (!cache)
+@@ -184,7 +184,8 @@
+ cache->numpurges++;
+
+ for (i=0; i < cache->size; ++i) {
+- p = cache->nodes[i];
++ pp = cache->nodes + i;
++ p = *pp;
+ while (p != NULL) {
+ if (p->add_time < cache->marktime) {
+ q = p->next;
+@@ -192,10 +193,11 @@
+ util_ald_free(cache, p);
+ cache->numentries--;
+ cache->npurged++;
+- p = q;
++ p = *pp = q;
+ }
+ else {
+- p = p->next;
++ pp = &(p->next);
++ p = *pp;
+ }
+ }
+ }
+@@ -687,6 +689,9 @@
+ break;
+ }
+
++ }
++ else {
++ buf = "";
+ }
+ }
+ else {
Propchange: release/httpd/patches/apply_to_2.0.52/util_ldap_cache_mgr.c.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.53/README.html
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_2.0.53/mod_ldap_timeout.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.0.63/CVE-2008-2364-patch-2.0.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_2.0.63/mod_proxy_ftp_CVE-2008-2939.diff
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.1.7/non-showstoppers.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.2.0/dbd-win32.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.2.0/win32-buildfix-2.2.0.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.2.11/PR46949.diff
------------------------------------------------------------------------------
svn:eol-style = native
Modified: release/httpd/patches/apply_to_2.2.4/hack-msvc8-httpd-2.2.4.patch
==============================================================================
--- release/httpd/patches/apply_to_2.2.4/hack-msvc8-httpd-2.2.4.patch (original)
+++ release/httpd/patches/apply_to_2.2.4/hack-msvc8-httpd-2.2.4.patch Sat Oct 3 18:02:09 2009
@@ -1,24 +1,24 @@
-###
-### A trivial hack to copy the .manifest files along with the binaries
-### when building from the command line on Visual Studio 2005
-###
-### Courtesy of Gustavo Lopes <Apache geleia.net>
-### Posted to dev@httpd.apache.org,
-### Message-ID: <00...@cataphract>
-###
---- Makefile.win.orig 2006-12-07 11:09:37.000000000 -0600
-+++ Makefile.win 2007-01-08 23:55:56.000000000 -0600
-@@ -605,6 +605,13 @@
- inst_exe="$(INSTDIR)\bin" \
- inst_dll="$(INSTDIR)\bin" \
- inst_so="$(INSTDIR)\modules"
-+ if EXIST $(LONG)\httpd.exe.manifest \
-+ $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=$(SHORT) LONG=$(LONG) \
-+ _copybin src_exe=exe.manifest src_dll=dll.manifest \
-+ src_so=so.manifest quiet="-" \
-+ inst_exe="$(INSTDIR)\bin" \
-+ inst_dll="$(INSTDIR)\bin" \
-+ inst_so="$(INSTDIR)\modules"
- cd srclib\apr-iconv
- $(MAKE) $(MAKEOPT) -f build\modules.mk.win install \
- BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=. \
+###
+### A trivial hack to copy the .manifest files along with the binaries
+### when building from the command line on Visual Studio 2005
+###
+### Courtesy of Gustavo Lopes <Apache geleia.net>
+### Posted to dev@httpd.apache.org,
+### Message-ID: <00...@cataphract>
+###
+--- Makefile.win.orig 2006-12-07 11:09:37.000000000 -0600
++++ Makefile.win 2007-01-08 23:55:56.000000000 -0600
+@@ -605,6 +605,13 @@
+ inst_exe="$(INSTDIR)\bin" \
+ inst_dll="$(INSTDIR)\bin" \
+ inst_so="$(INSTDIR)\modules"
++ if EXIST $(LONG)\httpd.exe.manifest \
++ $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=$(SHORT) LONG=$(LONG) \
++ _copybin src_exe=exe.manifest src_dll=dll.manifest \
++ src_so=so.manifest quiet="-" \
++ inst_exe="$(INSTDIR)\bin" \
++ inst_dll="$(INSTDIR)\bin" \
++ inst_so="$(INSTDIR)\modules"
+ cd srclib\apr-iconv
+ $(MAKE) $(MAKEOPT) -f build\modules.mk.win install \
+ BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=. \
Propchange: release/httpd/patches/apply_to_2.2.4/hack-msvc8-httpd-2.2.4.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.2.8/CVE-2008-2364-patch-2.2.txt
('svn:mime-type' removed)
Propchange: release/httpd/patches/apply_to_2.2.8/cgid_socket_perms.txt
('svn:mime-type' removed)
Modified: release/httpd/patches/apply_to_2.2.9/httpd-2.2.9-win32-src.patch
==============================================================================
--- release/httpd/patches/apply_to_2.2.9/httpd-2.2.9-win32-src.patch (original)
+++ release/httpd/patches/apply_to_2.2.9/httpd-2.2.9-win32-src.patch Sat Oct 3 18:02:09 2009
@@ -1,62 +1,62 @@
-Index: Makefile.win
-===================================================================
---- Makefile.win (revision 666274)
-+++ Makefile.win (working copy)
-@@ -134,11 +134,10 @@
-
- _trydbd:
- !IF $(USEMAK) == 1
-- cd srclib\apr-util\dbd & \
-- for %d in ($(DBD_LIST)) do \
-- $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - $(LONG)" RECURSE=0 $(CTARGET)
-- cd ..
--
-+ cd srclib\apr-util\dbd
-+ for %d in ($(DBD_LIST)) do \
-+ $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-+ cd ..\..\..
- !ELSEIF $(USESLN) == 1
- for %d in ($(DBD_LIST)) do \
- devenv Apache.sln /useenv $(CTARGET) $(LONG) /project apr_dbd_%d
-@@ -265,9 +264,16 @@
- cd ..\..\..
- $(MAKE) $(MAKEOPT) -f aprutil.mak CFG="aprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f libaprutil.mak CFG="libaprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-- cd ldap
-- $(MAKE) $(MAKEOPT) -f apr_ldap.mak CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET)
-- cd ..\..\..
-+ cd ldap
-+ $(MAKE) $(MAKEOPT) -f apr_ldap.mak CFG="apr_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-+ cd ..
-+!IFDEF DBD_LIST
-+ cd dbd
-+ for %d in ($(DBD_LIST)) do \
-+ $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-+ cd ..
-+!ENDIF
-+ cd ..\..
- cd srclib\pcre
- $(MAKE) $(MAKEOPT) -f dftables.mak CFG="dftables - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f pcre.mak CFG="pcre - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-@@ -484,7 +491,7 @@
- copy srclib\apr-util\ldap\$(LONG)\apr_ldap-1.$(src_dll) "$(inst_dll)" <.y
- !IFDEF DBD_LIST
- for %d in ($(DBD_LIST)) do ( \
-- copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y && \
-+ copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y \
- )
- !ENDIF
- !IF EXIST("srclib\zlib\zlib1.$(src_dll)")
-Index: srclib/apr/include/apr.hw
-===================================================================
---- srclib/apr/include/apr.hw (revision 661875)
-+++ srclib/apr/include/apr.hw (working copy)
-@@ -280,7 +277,7 @@
- #define APR_HAVE_IN_ADDR 1
- #define APR_HAVE_INET_ADDR 1
- #define APR_HAVE_INET_NETWORK 0
--#define APR_HAVE_IPV6 1
-+#define APR_HAVE_IPV6 0
- #define APR_HAVE_MEMMOVE 1
- #define APR_HAVE_SETRLIMIT 0
- #define APR_HAVE_SIGACTION 0
+Index: Makefile.win
+===================================================================
+--- Makefile.win (revision 666274)
++++ Makefile.win (working copy)
+@@ -134,11 +134,10 @@
+
+ _trydbd:
+ !IF $(USEMAK) == 1
+- cd srclib\apr-util\dbd & \
+- for %d in ($(DBD_LIST)) do \
+- $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - $(LONG)" RECURSE=0 $(CTARGET)
+- cd ..
+-
++ cd srclib\apr-util\dbd
++ for %d in ($(DBD_LIST)) do \
++ $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET)
++ cd ..\..\..
+ !ELSEIF $(USESLN) == 1
+ for %d in ($(DBD_LIST)) do \
+ devenv Apache.sln /useenv $(CTARGET) $(LONG) /project apr_dbd_%d
+@@ -265,9 +264,16 @@
+ cd ..\..\..
+ $(MAKE) $(MAKEOPT) -f aprutil.mak CFG="aprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f libaprutil.mak CFG="libaprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+- cd ldap
+- $(MAKE) $(MAKEOPT) -f apr_ldap.mak CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET)
+- cd ..\..\..
++ cd ldap
++ $(MAKE) $(MAKEOPT) -f apr_ldap.mak CFG="apr_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
++ cd ..
++!IFDEF DBD_LIST
++ cd dbd
++ for %d in ($(DBD_LIST)) do \
++ $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET)
++ cd ..
++!ENDIF
++ cd ..\..
+ cd srclib\pcre
+ $(MAKE) $(MAKEOPT) -f dftables.mak CFG="dftables - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f pcre.mak CFG="pcre - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+@@ -484,7 +491,7 @@
+ copy srclib\apr-util\ldap\$(LONG)\apr_ldap-1.$(src_dll) "$(inst_dll)" <.y
+ !IFDEF DBD_LIST
+ for %d in ($(DBD_LIST)) do ( \
+- copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y && \
++ copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y \
+ )
+ !ENDIF
+ !IF EXIST("srclib\zlib\zlib1.$(src_dll)")
+Index: srclib/apr/include/apr.hw
+===================================================================
+--- srclib/apr/include/apr.hw (revision 661875)
++++ srclib/apr/include/apr.hw (working copy)
+@@ -280,7 +277,7 @@
+ #define APR_HAVE_IN_ADDR 1
+ #define APR_HAVE_INET_ADDR 1
+ #define APR_HAVE_INET_NETWORK 0
+-#define APR_HAVE_IPV6 1
++#define APR_HAVE_IPV6 0
+ #define APR_HAVE_MEMMOVE 1
+ #define APR_HAVE_SETRLIMIT 0
+ #define APR_HAVE_SIGACTION 0
Propchange: release/httpd/patches/apply_to_2.2.9/httpd-2.2.9-win32-src.patch
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: release/httpd/patches/apply_to_2.2.9/mod_proxy_ftp_CVE-2008-2939.diff
------------------------------------------------------------------------------
svn:eol-style = native