Parent Directory
| 
Revision Log
| Links to HEAD: | (view) (annotate) |
| Sticky Revision: |
No functional change: remove trailing whitespace. This also means that "blank" lines, which had consisted of just spaces and/or tabs are now truly blank lines
Recreate 2.2.x branch from trunk.
* server/util_pcre.c (ap_regexec): Fix --with-pcre build with older versions of pcre.
Get httpd-2.1 building once again on win32. NEVER NEVER screw around with redeclaring AP_ macros and constants. If the compiler won't pick them up, e.g., AP_DECLARE, ya've done something wrong from the start. All httpd/ap headers depend on httpd.h - plain and simple, so this un-convolutes the unusual order here. STATIC has become PCRE_STATIC, along with some other odd definitions. The only remaining emit is that _pcre_free export is imported, which implies something is unusual with the declaration. Still researching.
* include/ap_regex.h: Include apr.h not stdlib.h; replace pointless regoff_t typedef with int; s/size_t/apr_size_t/;. Comment fixes. * server/util_pcre.c: s/size_t/apr_size_t/. * include/httpd.h: Include stdlib.h here instead since many other files assume it was included by httpd.h at some point.
Move the POSIX reg* implementations into the ap_* namespace; internalise the ap_reg*<->PCRE wrapper: * configure.in: Add srclib/pcre to the include path. * include/ap_regex.h: Renamed from include/pcreposix.h. Prefix all constants with AP_; prefix all functions and types with ap_. Define AP_DECLARE to nothing if necessary. Remove regcomp error codes. * include/httpd.h: Include ap_regex.h not pcreposix.h. (ap_pregcomp, ap_regexec, ap_regfree): s/regex_t/ap_regex_t/. (ap_regexec, ap_regerror): Prototypes moved to ap_regex.h. * server/util.c (regex_cleanup, ap_pregcomp, ap_pregsub, ap_pregfree): Adjust for ap_ prefixed types. (ap_regexec, ap_regerror): Removed. * server/Makefile.in: Build util_pcre.c. * server/util_pcre.c: Copied from srclib/pcre/pcreposix.c; remove use of PCRE-internals to do error mapping; rename types to add AP_/ap_ prefixes as above. Use APR includes. (ap_regerror): Use apr_snprintf. * srclib/pcre/Makefile.in: Don't build pcreposix.c into libpcre.la. * modules/*: Update to use new type and constant names. PR: 27750 (part one) Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton
Upgraded the copy of PCRE within srclib/pcre to version 5.0
general property cleanup
Performance optimization: use a temp buffer on the stack instead of a malloc'ed buffer in regexec() in cases where the required buffer size is small. This will help us avoid a malloc/free pair when executing mod_rewrite rules that use $1/$2/etc to reference sequences in the matched pattern. Note: I've also submitted this change as a patch for PCRE, but because the next PCRE release isn't planned until later this year I'm committing it to the httpd-2.0 copy of PCRE in the meantime.
PCRE 3.9 merge
This broken bit causes a segfault after locking pconf as read-only.
Yet another warning down (pps... I choose to cast rc since i is being doubled... I expect the mismatched types were deliberate.)
Initial revision
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.
| apache@apache.org | ViewVC Help |
| Powered by ViewVC 1.1.2 |