/[Apache-SVN]
ViewVC logotype

Revision 153384


Jump to revision: Previous Next
Author: jorton
Date: Fri Feb 11 12:00:41 2005 UTC (19 years, 2 months ago)
Changed paths: 26
Log Message:
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


Changed paths

Path Details
Directoryhttpd/httpd/trunk/configure.in modified , text changed
Directoryhttpd/httpd/trunk/include/ap_mmn.h modified , text changed
Directoryhttpd/httpd/trunk/include/ap_regex.h
(Copied from httpd/httpd/trunk/include/pcreposix.h, r126601)
added , text changed
Directoryhttpd/httpd/trunk/include/http_core.h modified , text changed
Directoryhttpd/httpd/trunk/include/httpd.h modified , text changed
Directoryhttpd/httpd/trunk/include/pcreposix.h deleted
Directoryhttpd/httpd/trunk/modules/experimental/mod_filter.c modified , text changed
Directoryhttpd/httpd/trunk/modules/filters/mod_include.c modified , text changed
Directoryhttpd/httpd/trunk/modules/mappers/mod_alias.c modified , text changed
Directoryhttpd/httpd/trunk/modules/mappers/mod_rewrite.c modified , text changed
Directoryhttpd/httpd/trunk/modules/metadata/mod_headers.c modified , text changed
Directoryhttpd/httpd/trunk/modules/metadata/mod_setenvif.c modified , text changed
Directoryhttpd/httpd/trunk/modules/metadata/mod_usertrack.c modified , text changed
Directoryhttpd/httpd/trunk/modules/metadata/mod_version.c modified , text changed
Directoryhttpd/httpd/trunk/modules/proxy/mod_proxy.c modified , text changed
Directoryhttpd/httpd/trunk/modules/proxy/mod_proxy.h modified , text changed
Directoryhttpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c modified , text changed
Directoryhttpd/httpd/trunk/modules/ssl/ssl_expr_eval.c modified , text changed
Directoryhttpd/httpd/trunk/modules/ssl/ssl_expr_parse.c modified , text changed
Directoryhttpd/httpd/trunk/modules/ssl/ssl_expr_parse.y modified , text changed
Directoryhttpd/httpd/trunk/server/Makefile.in modified , text changed
Directoryhttpd/httpd/trunk/server/core.c modified , text changed
Directoryhttpd/httpd/trunk/server/request.c modified , text changed
Directoryhttpd/httpd/trunk/server/util.c modified , text changed
Directoryhttpd/httpd/trunk/server/util_pcre.c
(Copied from httpd/httpd/trunk/srclib/pcre/pcreposix.c, r126601)
added , text changed
Directoryhttpd/httpd/trunk/srclib/pcre/Makefile.in modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26