75fd8aa481
- normalize patch-pcre.diff into makepatch format - All 4 CVE patches are included upstream and part of 2.0.64 - part of the local apxs.in changes are upstream now too - some patches were regenerated for offset updates ** There is NO security update here. ** Changes: http://www.apache.org/dist/httpd/CHANGES_2.0 With Hat: apache@ <ChangeLog> *) SECURITY: CVE-2010-1452 (cve.mitre.org) mod_dav: Fix Handling of requests without a path segment. PR: 49246 [Mark Drayton, Jeff Trawick] *) SECURITY: CVE-2009-1891 (cve.mitre.org) Fix a potential Denial-of-Service attack against mod_deflate or other modules, by forcing the server to consume CPU time in compressing a large file after a client disconnects. PR 39605. [Joe Orton, Ruediger Pluem] *) SECURITY: CVE-2009-3095 (cve.mitre.org) mod_proxy_ftp: sanity check authn credentials. [Stefan Fritsch <sf fritsch.de>, Joe Orton] *) SECURITY: CVE-2009-3094 (cve.mitre.org) mod_proxy_ftp: NULL pointer dereference on error paths. [Stefan Fritsch <sf fritsch.de>, Joe Orton] *) SECURITY: CVE-2009-3555 (cve.mitre.org) mod_ssl: Comprehensive fix of the TLS renegotiation prefix injection attack when compiled against OpenSSL version 0.9.8m or later. Introduces the 'SSLInsecureRenegotiation' directive to reopen this vulnerability and offer unsafe legacy renegotiation with clients which do not yet support the new secure renegotiation protocol, RFC 5746. [Joe Orton, and with thanks to the OpenSSL Team] *) SECURITY: CVE-2009-3555 (cve.mitre.org) mod_ssl: A partial fix for the TLS renegotiation prefix injection attack for OpenSSL versions prior to 0.9.8l; reject any client-initiated renegotiations. Forcibly disable keepalive for the connection if there is any buffered data readable. Any configuration which requires renegotiation for per-directory/location access control is still vulnerable, unless using openssl 0.9.8l or later. [Joe Orton, Ruediger Pluem, Hartmut Keil <Hartmut.Keil adnovum.ch>, Rainer Jung] *) SECURITY: CVE-2010-0434 (cve.mitre.org) Ensure each subrequest has a shallow copy of headers_in so that the parent request headers are not corrupted. Elimiates a problematic optimization in the case of no request body. PR 48359 [Jake Scott, William Rowe, Ruediger Pluem] *) SECURITY: CVE-2008-2364 (cve.mitre.org) mod_proxy_http: Better handling of excessive interim responses from origin server to prevent potential denial of service and high memory usage. Reported by Ryujiro Shibuya. [Ruediger Pluem, Joe Orton, Jim Jagielski] *) SECURITY: CVE-2010-0425 (cve.mitre.org) mod_isapi: Do not unload an isapi .dll module until the request processing is completed, avoiding orphaned callback pointers. [Brett Gervasoni <brettg senseofsecurity.com>, Jeff Trawick] *) SECURITY: CVE-2008-2939 (cve.mitre.org) mod_proxy_ftp: Prevent XSS attacks when using wildcards in the path of the FTP URL. Discovered by Marc Bevand of Rapid7. [Ruediger Pluem] *) Fix recursive ErrorDocument handling. PR 36090 [Chris Darroch] *) mod_ssl: Do not do overlapping memcpy. PR 45444 [Joe Orton] *) Add Set-Cookie and Set-Cookie2 to the list of headers allowed to pass through on a 304 response. [Nick Kew] *) apxs: Fix -A and -a options to ignore whitespace in httpd.conf [Philip M. Gollucci] </ChangeLog>
65 lines
2.5 KiB
C
65 lines
2.5 KiB
C
--- ./include/httpd.h.orig 2010-10-07 22:24:15.000000000 +0000
|
|
+++ ./include/httpd.h 2010-10-21 05:40:55.841622281 +0000
|
|
@@ -41,7 +41,7 @@
|
|
|
|
#include "os.h"
|
|
|
|
-#include "pcreposix.h"
|
|
+#include "ap_regex.h"
|
|
|
|
/* Note: util_uri.h is also included, see below */
|
|
|
|
@@ -1523,40 +1523,15 @@
|
|
* @li #REG_NEWLINE - Match-any-character operators don't match new-line
|
|
* @return The compiled regular expression
|
|
*/
|
|
-AP_DECLARE(regex_t *) ap_pregcomp(apr_pool_t *p, const char *pattern,
|
|
- int cflags);
|
|
-
|
|
+AP_DECLARE(ap_regex_t *) ap_pregcomp(apr_pool_t *p, const char *pattern,
|
|
+ int cflags);
|
|
+
|
|
/**
|
|
* Free the memory associated with a compiled regular expression
|
|
* @param p The pool the regex was allocated from
|
|
* @param reg The regular expression to free
|
|
*/
|
|
-AP_DECLARE(void) ap_pregfree(apr_pool_t *p, regex_t *reg);
|
|
-
|
|
-/**
|
|
- * Match a null-terminated string against a pre-compiled regex.
|
|
- * @param preg The pre-compiled regex
|
|
- * @param string The string to match
|
|
- * @param nmatch Provide information regarding the location of any matches
|
|
- * @param pmatch Provide information regarding the location of any matches
|
|
- * @param eflags Bitwise or of any of:
|
|
- * @li #REG_NOTBOL - match-beginning-of-line operator always
|
|
- * fails to match
|
|
- * @li #REG_NOTEOL - match-end-of-line operator always fails to match
|
|
- * @return 0 for successful match, #REG_NOMATCH otherwise
|
|
- */
|
|
-AP_DECLARE(int) ap_regexec(regex_t *preg, const char *string,
|
|
- size_t nmatch, regmatch_t pmatch[], int eflags);
|
|
-
|
|
-/**
|
|
- * Return the error code returned by regcomp or regexec into error messages
|
|
- * @param errcode the error code returned by regexec or regcomp
|
|
- * @param preg The precompiled regex
|
|
- * @param errbuf A buffer to store the error in
|
|
- * @param errbuf_size The size of the buffer
|
|
- */
|
|
-AP_DECLARE(size_t) ap_regerror(int errcode, const regex_t *preg,
|
|
- char *errbuf, size_t errbuf_size);
|
|
+AP_DECLARE(void) ap_pregfree(apr_pool_t *p, ap_regex_t *reg);
|
|
|
|
/**
|
|
* After performing a successful regex match, you may use this function to
|
|
@@ -1570,7 +1545,7 @@
|
|
* @param pmatch the pmatch array returned from ap_pregex
|
|
*/
|
|
AP_DECLARE(char *) ap_pregsub(apr_pool_t *p, const char *input, const char *source,
|
|
- size_t nmatch, regmatch_t pmatch[]);
|
|
+ size_t nmatch, ap_regmatch_t pmatch[]);
|
|
|
|
/**
|
|
* We want to downcase the type/subtype for comparison purposes
|