dgaudet 98/02/28 02:32:03
Modified: src Makefile.tmpl src/ap Makefile.tmpl src/include util_uri.h src/main Makefile.tmpl http_main.c util_uri.c src/modules/proxy Makefile.tmpl proxy_util.c src/modules/standard Makefile.tmpl Log: Some cleanup for uril_uri: - eliminate a few warnings - get rid of the static local in parse_uri_components_regex by creating util_uri_init() routine called from main() - don't use static re.match 'cause it's not thread safe - factor some common code from the win32 and unix case into common_init() - update dependencies still hacking. Revision Changes Path 1.79 +1 -1 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- Makefile.tmpl 1998/02/22 04:37:08 1.78 +++ Makefile.tmpl 1998/02/28 10:31:53 1.79 @@ -70,4 +70,4 @@ buildmark.o: buildmark.c modules.o: modules.c $(INCDIR)/httpd.h $(INCDIR)/conf.h os/unix/os.h \ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h 1.14 +6 -5 apache-1.3/src/ap/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Makefile.tmpl 1998/02/22 04:37:09 1.13 +++ Makefile.tmpl 1998/02/28 10:31:54 1.14 @@ -38,18 +38,19 @@ # DO NOT REMOVE ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_log.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_log.h ap_snprintf.o: ap_snprintf.c $(INCDIR)/conf.h ../os/unix/os.h \ $(INCDIR)/hsregex.h ap_strings.o: ap_strings.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h 1.3 +10 -7 apache-1.3/src/include/util_uri.h Index: util_uri.h =================================================================== RCS file: /export/home/cvs/apache-1.3/src/include/util_uri.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- util_uri.h 1998/02/27 15:19:54 1.2 +++ util_uri.h 1998/02/28 10:31:55 1.3 @@ -112,15 +112,18 @@ } uri_components; /* util_uri.c */ -extern unsigned short default_port_for_scheme(const char *scheme_str); -extern unsigned short default_port_for_request(const request_rec *r); -extern struct hostent *pduphostent(pool *p, struct hostent *hp); -extern struct hostent *pgethostbyname(pool *p, const char *hostname); -extern char *unparse_uri_components(pool *p, const uri_components *uptr, +API_EXPORT(unsigned short) default_port_for_scheme(const char *scheme_str); +API_EXPORT(unsigned short) default_port_for_request(const request_rec *r); +API_EXPORT(struct hostent *) pduphostent(pool *p, struct hostent *hp); +API_EXPORT(struct hostent *) pgethostbyname(pool *p, const char *hostname); +API_EXPORT(char *) unparse_uri_components(pool *p, const uri_components *uptr, int *pHostlen, unsigned flags); -extern int parse_uri_components(pool *p, const char *uri, uri_components *uptr, +API_EXPORT(int) parse_uri_components(pool *p, const char *uri, uri_components *uptr, int *pHostlen); -extern int parse_uri_components_regex(pool *p, const char *uri, +API_EXPORT(int) parse_uri_components_regex(pool *p, const char *uri, uri_components *uptr); + +/* called by the core in main() */ +extern void util_uri_init(void); #endif /*UTIL_URI_H*/ 1.15 +47 -38 apache-1.3/src/main/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile.tmpl 1998/02/27 15:26:05 1.14 +++ Makefile.tmpl 1998/02/28 10:31:56 1.15 @@ -51,81 +51,90 @@ # DO NOT REMOVE alloc.o: alloc.c $(INCDIR)/httpd.h $(INCDIR)/conf.h ../os/unix/os.h \ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ - $(INCDIR)/ap.h $(INCDIR)/multithread.h $(INCDIR)/http_log.h + $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/multithread.h \ + $(INCDIR)/http_log.h buff.o: buff.c $(INCDIR)/httpd.h $(INCDIR)/conf.h ../os/unix/os.h \ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ - $(INCDIR)/ap.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h + $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \ + $(INCDIR)/http_log.h fnmatch.o: fnmatch.c $(INCDIR)/fnmatch.h http_bprintf.o: http_bprintf.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h http_config.o: http_config.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ $(INCDIR)/http_request.h $(INCDIR)/http_conf_globals.h \ $(INCDIR)/http_vhost.h $(INCDIR)/explain.h http_core.o: http_core.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/http_request.h $(INCDIR)/http_conf_globals.h \ - $(INCDIR)/http_vhost.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h \ - $(INCDIR)/rfc1413.h $(INCDIR)/util_md5.h $(INCDIR)/md5.h \ - $(INCDIR)/scoreboard.h $(INCDIR)/fnmatch.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \ + $(INCDIR)/http_conf_globals.h $(INCDIR)/http_vhost.h \ + $(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h \ + $(INCDIR)/util_md5.h $(INCDIR)/md5.h $(INCDIR)/scoreboard.h \ + $(INCDIR)/fnmatch.h http_log.o: http_log.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_main.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_main.h http_main.o: http_main.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_main.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_config.h \ + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/http_config.h \ $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \ $(INCDIR)/http_conf_globals.h $(INCDIR)/http_core.h \ $(INCDIR)/http_vhost.h $(INCDIR)/util_script.h \ $(INCDIR)/scoreboard.h $(INCDIR)/multithread.h $(INCDIR)/explain.h http_protocol.o: http_protocol.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/http_main.h $(INCDIR)/http_request.h \ - $(INCDIR)/http_vhost.h $(INCDIR)/http_log.h $(INCDIR)/util_date.h \ + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \ + $(INCDIR)/http_request.h $(INCDIR)/http_vhost.h \ + $(INCDIR)/http_log.h $(INCDIR)/util_date.h \ $(INCDIR)/http_conf_globals.h http_request.o: http_request.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_request.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_main.h $(INCDIR)/scoreboard.h $(INCDIR)/fnmatch.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_request.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_main.h $(INCDIR)/scoreboard.h \ + $(INCDIR)/fnmatch.h http_vhost.o: http_vhost.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_conf_globals.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_vhost.h $(INCDIR)/http_protocol.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_vhost.h \ + $(INCDIR)/http_protocol.h md5c.o: md5c.c $(INCDIR)/conf.h ../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/md5.h rfc1413.o: rfc1413.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_log.h \ - $(INCDIR)/rfc1413.h $(INCDIR)/http_main.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h $(INCDIR)/http_main.h util.o: util.c $(INCDIR)/httpd.h $(INCDIR)/conf.h ../os/unix/os.h \ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ - $(INCDIR)/ap.h $(INCDIR)/http_conf_globals.h $(INCDIR)/http_log.h + $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_conf_globals.h \ + $(INCDIR)/http_log.h util_date.o: util_date.c $(INCDIR)/conf.h ../os/unix/os.h \ $(INCDIR)/hsregex.h $(INCDIR)/util_date.h util_md5.o: util_md5.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_md5.h \ - $(INCDIR)/md5.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/util_md5.h $(INCDIR)/md5.h util_script.o: util_script.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_conf_globals.h $(INCDIR)/http_main.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_request.h \ - $(INCDIR)/util_script.h $(INCDIR)/util_date.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \ + $(INCDIR)/http_main.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_request.h $(INCDIR)/util_script.h \ + $(INCDIR)/util_date.h util_uri.o: util_uri.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_conf_globals.h $(INCDIR)/util_uri.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_conf_globals.h 1.297 +41 -48 apache-1.3/src/main/http_main.c Index: http_main.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.296 retrieving revision 1.297 diff -u -r1.296 -r1.297 --- http_main.c 1998/02/27 15:15:19 1.296 +++ http_main.c 1998/02/28 10:31:58 1.297 @@ -86,6 +86,7 @@ #include "http_core.h" /* for get_remote_host */ #include "http_vhost.h" #include "util_script.h" /* to force util_script.c linking */ +#include "util_uri.h" #include "scoreboard.h" #include "multithread.h" #include <sys/stat.h> @@ -2892,6 +2893,43 @@ printf("\n"); } + +/* Some init code that's common between win32 and unix... well actually + * some of it is #ifdef'd but was duplicated before anyhow. This stuff + * is still a mess. + */ +static void common_init(void) +{ +#ifdef AUX + (void) set42sig(); +#endif + +#ifdef SecureWare + if (set_auth_parameters(argc, argv) < 0) + perror("set_auth_parameters"); + if (getluid() < 0) + if (setluid(getuid()) < 0) + perror("setluid"); + if (setreuid(0, 0) < 0) + perror("setreuid"); +#endif + +#ifdef WIN32 + /* Initialize the stupid sockets */ + AMCSocketInitialize(); +#endif /* WIN32 */ + + init_alloc(); + pconf = permanent_pool; + ptrans = make_sub_pool(pconf); + + util_uri_init(); + + pcommands = make_sub_pool(NULL); + server_pre_read_config = make_array(pcommands, 1, sizeof(char *)); + server_post_read_config = make_array(pcommands, 1, sizeof(char *)); +} + #ifndef MULTITHREAD /***************************************************************** * Child process main loop. @@ -3751,27 +3789,7 @@ MONCONTROL(0); -#ifdef AUX - (void) set42sig(); -#endif - -#ifdef SecureWare - if (set_auth_parameters(argc, argv) < 0) - perror("set_auth_parameters"); - if (getluid() < 0) - if (setluid(getuid()) < 0) - perror("setluid"); - if (setreuid(0, 0) < 0) - perror("setreuid"); -#endif - - init_alloc(); - pconf = permanent_pool; - ptrans = make_sub_pool(pconf); - - pcommands = make_sub_pool(NULL); - server_pre_read_config = make_array(pcommands, 1, sizeof(char *)); - server_post_read_config = make_array(pcommands, 1, sizeof(char *)); + common_init(); server_argv0 = argv[0]; ap_cpystrn(server_root, HTTPD_ROOT, sizeof(server_root)); @@ -4879,34 +4897,9 @@ char *cp; int run_as_service = 1; int install = 0; - -#ifdef AUX - (void) set42sig(); -#endif - -#ifdef SecureWare - if (set_auth_parameters(argc, argv) < 0) - perror("set_auth_parameters"); - if (getluid() < 0) - if (setluid(getuid()) < 0) - perror("setluid"); - if (setreuid(0, 0) < 0) - perror("setreuid"); -#endif - -#ifdef WIN32 - /* Initialize the stupid sockets */ - AMCSocketInitialize(); -#endif /* WIN32 */ - - init_alloc(); - pconf = permanent_pool; - ptrans = make_sub_pool(pconf); - - pcommands = make_sub_pool(NULL); - server_pre_read_config = make_array(pcommands, 1, sizeof(char *)); - server_post_read_config = make_array(pcommands, 1, sizeof(char *)); + common_init(); + server_argv0 = argv[0]; /* Get the serverroot from the registry, if it exists. This can be 1.3 +80 -83 apache-1.3/src/main/util_uri.c Index: util_uri.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/util_uri.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- util_uri.c 1998/02/27 15:19:55 1.2 +++ util_uri.c 1998/02/28 10:31:59 1.3 @@ -76,7 +76,7 @@ }; -unsigned short default_port_for_scheme(const char *scheme_str) +API_EXPORT(unsigned short) default_port_for_scheme(const char *scheme_str) { schemes_t *scheme; @@ -88,7 +88,7 @@ } #ifdef WITH_UTIL_URI -unsigned short default_port_for_request(const request_rec *r) +API_EXPORT(unsigned short) default_port_for_request(const request_rec *r) { return (r->parsed_uri.has_scheme) ? default_port_for_scheme(r->parsed_uri.scheme) @@ -107,7 +107,7 @@ * from a call to gethostbyname() and lives in static storage. * By creating a copy we can tuck it away for later use. */ -struct hostent *pduphostent(pool *p, struct hostent *hp) +API_EXPORT(struct hostent *) pduphostent(pool *p, struct hostent *hp) { struct hostent *newent; char **ptrs; @@ -160,7 +160,7 @@ * COPY OF the hostent structure, intended to be stored and used later. * (gethostbyname() uses static storage that would be overwritten on each call) */ -struct hostent *pgethostbyname(pool *p, const char *hostname) +API_EXPORT(struct hostent *) pgethostbyname(pool *p, const char *hostname) { struct hostent *hp = gethostbyname(hostname); return (hp == NULL) ? NULL : pduphostent(p, hp); @@ -170,7 +170,7 @@ /* Unparse a uri_components structure to an URI string. * Optionally suppress the password for security reasons. */ -char *unparse_uri_components(pool *p, const uri_components *uptr, int *pHostlen, unsigned flags) +API_EXPORT(char *) unparse_uri_components(pool *p, const uri_components *uptr, int *pHostlen, unsigned flags) { char *ret = ""; @@ -218,7 +218,7 @@ * - fills in fields of uri_components *uptr * - none on any of the r->* fields */ -int parse_uri_components(pool *p, const char *uri, uri_components *uptr, int *pHostlen) +API_EXPORT(int) parse_uri_components(pool *p, const char *uri, uri_components *uptr, int *pHostlen) { const char *s; int ret = HTTP_OK; @@ -383,6 +383,55 @@ return ret; } +static regex_t re_uri; +static regex_t re_hostpart; + +void util_uri_init(void) +{ + int ret; + const char *re_str; + + /* This is a modified version of the regex that appeared in + * http://www.ics.uci.edu/~fielding/url/url.txt + * It doesnt allow the uri to contain a scheme but no hostinfo + * or vice versa. + * $ 12 3 4 5 6 7 8 */ + re_str = "^(([^:/?#]+)://([^/?#]+))?([^?#]*)(\\?([^#]*))?(#(.*))?"; + /* ^^scheme^^://^^site^^^ ^^path^^ ?^query^ #frag */ + if ((ret = regcomp(&re_uri, re_str, REG_EXTENDED)) != 0) { + char line[1024]; + + /* Make a readable error message */ + ret = regerror(ret, &re_uri, line, sizeof line); + aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, NULL, + "Internal error: regcomp(\"%s\") returned non-zero (%s) - " + "possibly due to broken regex lib! " + "Did you define WANTHSREGEX=yes?", + re_str, line); + + exit(1); + } + + /* This is a sub-RE which will break down the hostinfo part, + * i.e., user, password, hostname and port. + * $ 12 3 4 5 6 */ + re_str = "^(([^:]*):(.*)?@)?([^@:]*)(:(.*))?$"; + /* ^^user^ :pw ^host^ port */ + if ((ret = regcomp(&re_hostpart, re_str, REG_EXTENDED|REG_ICASE)) != 0) { + char line[1024]; + + /* Make a readable error message */ + ret = regerror(ret, &re_hostpart, line, sizeof line); + aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, NULL, + "Internal error: regcomp(\"%s\") returned non-zero (%s) - " + "possibly due to broken regex lib! " + "Did you define WANTHSREGEX=yes?", + re_str, line); + + exit(1); + } +} + /* parse_uri_components_regex(): * Parse a given URI, fill in all supplied fields of a uri_components * structure. This eliminates the necessity of extracting host, port, @@ -391,16 +440,11 @@ * - fills in fields of uri_components *uptr * - none on any of the r->* fields */ -int parse_uri_components_regex(pool *p, const char *uri, uri_components *uptr) +API_EXPORT(int) parse_uri_components_regex(pool *p, const char *uri, uri_components *uptr) { - int ret = HTTP_OK; - static struct { - regex_t uri; - regex_t hostpart; - regmatch_t match[10]; /* This must have at least as much elements - * as there are braces in the re_strings */ - unsigned is_initialized:1; - } re = { 0, 0, 0 }; + int ret; + regmatch_t match[10]; /* This must have at least as much elements + * as there are braces in the re_strings */ ap_assert (uptr != NULL); @@ -410,55 +454,8 @@ memset (uptr, '\0', sizeof(*uptr)); uptr->is_initialized = 1; - if (!re.is_initialized) { - const char *re_str; - - re.is_initialized = 1; - - /* This is a modified version of the regex that appeared in - * http://www.ics.uci.edu/~fielding/url/url.txt - * It doesnt allow the uri to contain a scheme but no hostinfo - * or vice versa. - * $ 12 3 4 5 6 7 8 */ - re_str = "^(([^:/?#]+)://([^/?#]+))?([^?#]*)(\\?([^#]*))?(#(.*))?"; - /* ^^scheme^^://^^site^^^ ^^path^^ ?^query^ #frag */ - if ((ret = regcomp(&re.uri, re_str, REG_EXTENDED)) != 0) - { - char line[1024]; - - /* Make a readable error message */ - ret = regerror(ret, &re.uri, line, sizeof line); - aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, NULL, - "Internal error: regcomp(\"%s\") returned non-zero (%s) - " - "possibly due to broken regex lib! " - "Did you define WANTHSREGEX=yes?", - re_str, line); - - return HTTP_INTERNAL_SERVER_ERROR; - } - - /* This is a sub-RE which will break down the hostinfo part, - * i.e., user, password, hostname and port. - * $ 12 3 4 5 6 */ - re_str = "^(([^:]*):(.*)?@)?([^@:]*)(:(.*))?$"; - /* ^^user^ :pw ^host^ port */ - if ((ret = regcomp(&re.hostpart, re_str, REG_EXTENDED|REG_ICASE)) != 0) - { - char line[1024]; - - /* Make a readable error message */ - ret = regerror(ret, &re.hostpart, line, sizeof line); - aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, NULL, - "Internal error: regcomp(\"%s\") returned non-zero (%s) - " - "possibly due to broken regex lib! " - "Did you define WANTHSREGEX=yes?", - re_str, line); - - return HTTP_INTERNAL_SERVER_ERROR; - } - } - ret = regexec(&re.uri, uri, re.uri.re_nsub, re.match, 0); + ret = regexec(&re_uri, uri, re_uri.re_nsub, match, 0); if (ret != 0) { aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, NULL, @@ -469,30 +466,30 @@ } /* if hostlen is 0, it's not a proxy request */ - uptr->hostlen = (re.match[1].rm_eo - re.match[1].rm_so); + uptr->hostlen = (match[1].rm_eo - match[1].rm_so); - uptr->has_scheme = (re.match[2].rm_so != re.match[2].rm_eo); - uptr->has_hostinfo = (re.match[3].rm_so != re.match[3].rm_eo); - uptr->has_path = (re.match[4].rm_so != re.match[4].rm_eo); - uptr->has_query = (re.match[5].rm_so != re.match[5].rm_eo); - uptr->has_fragment = (re.match[7].rm_so != re.match[7].rm_eo); + uptr->has_scheme = (match[2].rm_so != match[2].rm_eo); + uptr->has_hostinfo = (match[3].rm_so != match[3].rm_eo); + uptr->has_path = (match[4].rm_so != match[4].rm_eo); + uptr->has_query = (match[5].rm_so != match[5].rm_eo); + uptr->has_fragment = (match[7].rm_so != match[7].rm_eo); if (uptr->has_scheme) - uptr->scheme = pstrndup (p, uri+re.match[2].rm_so, re.match[2].rm_eo - re.match[2].rm_so); + uptr->scheme = pstrndup (p, uri+match[2].rm_so, match[2].rm_eo - match[2].rm_so); if (uptr->has_hostinfo) - uptr->hostinfo = pstrndup (p, uri+re.match[3].rm_so, re.match[3].rm_eo - re.match[3].rm_so); + uptr->hostinfo = pstrndup (p, uri+match[3].rm_so, match[3].rm_eo - match[3].rm_so); if (uptr->has_path) - uptr->path = pstrndup (p, uri+re.match[4].rm_so, re.match[4].rm_eo - re.match[4].rm_so); + uptr->path = pstrndup (p, uri+match[4].rm_so, match[4].rm_eo - match[4].rm_so); if (uptr->has_query) - uptr->query = pstrndup (p, uri+re.match[6].rm_so, re.match[6].rm_eo - re.match[6].rm_so); + uptr->query = pstrndup (p, uri+match[6].rm_so, match[6].rm_eo - match[6].rm_so); if (uptr->has_fragment) - uptr->fragment = pstrndup (p, uri+re.match[7].rm_so, re.match[7].rm_eo - re.match[7].rm_so); + uptr->fragment = pstrndup (p, uri+match[7].rm_so, match[7].rm_eo - match[7].rm_so); if (uptr->has_hostinfo) { /* Parse the hostinfo part to extract user, password, host, and port */ - ret = regexec(&re.hostpart, uptr->hostinfo, re.hostpart.re_nsub, re.match, 0); + ret = regexec(&re_hostpart, uptr->hostinfo, re_hostpart.re_nsub, match, 0); if (ret != 0) { aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, NULL, "regexec() could not parse (\"%s\") as host part", @@ -504,14 +501,14 @@ /* $ 12 3 4 5 6 */ /* = "^(([^:]*):(.*)?@)?([^@:]*)(:([0-9]*))?$" */ /* ^^user^ :pw ^host^ port */ - if (uptr->has_user = (re.match[2].rm_so != re.match[2].rm_eo)) - uptr->user = pstrndup (p, uptr->hostinfo+re.match[2].rm_so, re.match[2].rm_eo - re.match[2].rm_so); - if (uptr->has_password = (re.match[3].rm_so != re.match[3].rm_eo)) - uptr->password = pstrndup (p, uptr->hostinfo+re.match[3].rm_so, re.match[3].rm_eo - re.match[3].rm_so); - if (uptr->has_hostname = (re.match[4].rm_so != re.match[4].rm_eo)) - uptr->hostname = pstrndup (p, uptr->hostinfo+re.match[4].rm_so, re.match[4].rm_eo - re.match[4].rm_so); - if (uptr->has_port = (re.match[5].rm_so != re.match[5].rm_eo)) { - uptr->port_str = pstrndup (p, uptr->hostinfo+re.match[5].rm_so+1, re.match[5].rm_eo - re.match[5].rm_so-1); + if ((uptr->has_user = (match[2].rm_so != match[2].rm_eo))) + uptr->user = pstrndup (p, uptr->hostinfo+match[2].rm_so, match[2].rm_eo - match[2].rm_so); + if ((uptr->has_password = (match[3].rm_so != match[3].rm_eo))) + uptr->password = pstrndup (p, uptr->hostinfo+match[3].rm_so, match[3].rm_eo - match[3].rm_so); + if ((uptr->has_hostname = (match[4].rm_so != match[4].rm_eo))) + uptr->hostname = pstrndup (p, uptr->hostinfo+match[4].rm_so, match[4].rm_eo - match[4].rm_so); + if ((uptr->has_port = (match[5].rm_so != match[5].rm_eo))) { + uptr->port_str = pstrndup (p, uptr->hostinfo+match[5].rm_so+1, match[5].rm_eo - match[5].rm_so-1); /* Note that the port string can be empty. * If it is, we use the default port associated with the scheme */ 1.4 +40 -36 apache-1.3/src/modules/proxy/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/Makefile.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.tmpl 1998/02/22 04:37:16 1.3 +++ Makefile.tmpl 1998/02/28 10:32:01 1.4 @@ -32,39 +32,43 @@ $(OBJS): Makefile # DO NOT REMOVE -mod_proxy.o: mod_proxy.c mod_proxy.h ../../include/httpd.h \ - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \ - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \ - ../../include/http_config.h ../../include/http_protocol.h \ - ../../include/explain.h ../../include/http_log.h -proxy_cache.o: proxy_cache.c mod_proxy.h ../../include/httpd.h \ - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \ - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \ - ../../include/http_config.h ../../include/http_protocol.h \ - ../../include/explain.h ../../include/http_log.h \ - ../../include/http_main.h ../../include/util_date.h \ - ../../include/multithread.h ../../include/md5.h -proxy_connect.o: proxy_connect.c mod_proxy.h ../../include/httpd.h \ - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \ - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \ - ../../include/http_config.h ../../include/http_protocol.h \ - ../../include/explain.h ../../include/http_log.h \ - ../../include/http_main.h -proxy_ftp.o: proxy_ftp.c mod_proxy.h ../../include/httpd.h \ - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \ - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \ - ../../include/http_config.h ../../include/http_protocol.h \ - ../../include/explain.h ../../include/http_main.h \ - ../standard/mod_mime.h -proxy_http.o: proxy_http.c mod_proxy.h ../../include/httpd.h \ - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \ - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \ - ../../include/http_config.h ../../include/http_protocol.h \ - ../../include/explain.h ../../include/http_log.h \ - ../../include/http_main.h ../../include/util_date.h -proxy_util.o: proxy_util.c mod_proxy.h ../../include/httpd.h \ - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \ - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \ - ../../include/http_config.h ../../include/http_protocol.h \ - ../../include/explain.h ../../include/http_main.h ../../include/md5.h \ - ../../include/multithread.h ../../include/http_log.h +mod_proxy.o: mod_proxy.c mod_proxy.h $(INCDIR)/httpd.h \ + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \ + $(INCDIR)/http_log.h +proxy_cache.o: proxy_cache.c mod_proxy.h $(INCDIR)/httpd.h \ + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_main.h \ + $(INCDIR)/util_date.h $(INCDIR)/multithread.h \ + $(INCDIR)/md5.h +proxy_connect.o: proxy_connect.c mod_proxy.h $(INCDIR)/httpd.h \ + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_main.h +proxy_ftp.o: proxy_ftp.c mod_proxy.h $(INCDIR)/httpd.h \ + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \ + $(INCDIR)/http_main.h ../standard/mod_mime.h +proxy_http.o: proxy_http.c mod_proxy.h $(INCDIR)/httpd.h \ + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_main.h \ + $(INCDIR)/http_core.h $(INCDIR)/util_date.h +proxy_util.o: proxy_util.c mod_proxy.h $(INCDIR)/httpd.h \ + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \ + $(INCDIR)/http_main.h $(INCDIR)/md5.h \ + $(INCDIR)/multithread.h $(INCDIR)/http_log.h 1.46 +2 -2 apache-1.3/src/modules/proxy/proxy_util.c Index: proxy_util.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- proxy_util.c 1998/02/27 15:15:26 1.45 +++ proxy_util.c 1998/02/28 10:32:01 1.46 @@ -891,7 +891,7 @@ /* Iterate over up to 4 (dotted) quads. */ for (quads = 0; quads < 4 && *addr != '\0'; ++quads) { - const char *tmp; + char *tmp; if (*addr == '/' && quads > 0) /* netmask starts here. */ break; @@ -919,7 +919,7 @@ This->addr.s_addr |= htonl(ip_addr[i] << (24 - 8 * i)); if (addr[0] == '/' && isdigit(addr[1])) { /* net mask follows: */ - const char *tmp; + char *tmp; ++addr; 1.8 +96 -84 apache-1.3/src/modules/standard/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /export/home/cvs/apache-1.3/src/modules/standard/Makefile.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile.tmpl 1998/02/22 04:37:17 1.7 +++ Makefile.tmpl 1998/02/28 10:32:02 1.8 @@ -18,171 +18,183 @@ # DO NOT REMOVE mod_access.o: mod_access.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_request.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_request.h mod_actions.o: mod_actions.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_request.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/http_main.h $(INCDIR)/http_log.h \ - $(INCDIR)/util_script.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_request.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \ + $(INCDIR)/http_log.h $(INCDIR)/util_script.h mod_alias.o: mod_alias.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h mod_asis.o: mod_asis.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \ - $(INCDIR)/util_script.h $(INCDIR)/http_main.h \ - $(INCDIR)/http_request.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \ + $(INCDIR)/http_log.h $(INCDIR)/util_script.h \ + $(INCDIR)/http_main.h $(INCDIR)/http_request.h mod_auth.o: mod_auth.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_protocol.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h mod_auth_anon.o: mod_auth_anon.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/http_request.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h mod_auth_db.o: mod_auth_db.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_protocol.h mod_auth_dbm.o: mod_auth_dbm.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_protocol.h mod_autoindex.o: mod_autoindex.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_main.h \ - $(INCDIR)/util_script.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_request.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_main.h $(INCDIR)/util_script.h mod_cern_meta.o: mod_cern_meta.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h $(INCDIR)/util_script.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_request.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/util_script.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_request.h mod_cgi.o: mod_cgi.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_request.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \ - $(INCDIR)/http_log.h $(INCDIR)/util_script.h \ - $(INCDIR)/http_conf_globals.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_request.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \ + $(INCDIR)/http_main.h $(INCDIR)/http_log.h \ + $(INCDIR)/util_script.h $(INCDIR)/http_conf_globals.h mod_digest.o: mod_digest.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/util_md5.h \ - $(INCDIR)/md5.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ + $(INCDIR)/util_md5.h $(INCDIR)/md5.h mod_dir.o: mod_dir.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_request.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_main.h $(INCDIR)/util_script.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_main.h \ + $(INCDIR)/util_script.h mod_env.o: mod_env.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h mod_expires.o: mod_expires.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_log.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_log.h mod_headers.o: mod_headers.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h mod_imap.o: mod_imap.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_request.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \ - $(INCDIR)/http_log.h $(INCDIR)/util_script.h -mod_include.o: mod_include.c $(INCDIR)/httpd.h \ - $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ $(INCDIR)/http_config.h $(INCDIR)/http_request.h \ $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_main.h \ + $(INCDIR)/http_main.h $(INCDIR)/http_log.h \ $(INCDIR)/util_script.h +mod_include.o: mod_include.c $(INCDIR)/httpd.h \ + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_request.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_main.h $(INCDIR)/util_script.h mod_info.o: mod_info.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_main.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/util_script.h $(INCDIR)/http_conf_globals.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_main.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/util_script.h \ + $(INCDIR)/http_conf_globals.h mod_log_agent.o: mod_log_agent.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h mod_log_config.o: mod_log_config.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_log.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_log.h mod_log_referer.o: mod_log_referer.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h mod_mime.o: mod_mime.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - mod_mime.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h mod_mime.h mod_mime_magic.o: mod_mime_magic.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_request.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_protocol.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_request.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h mod_negotiation.o: mod_negotiation.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_request.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ - $(INCDIR)/util_script.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_request.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_log.h $(INCDIR)/util_script.h mod_rewrite.o: mod_rewrite.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_request.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h mod_rewrite.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_request.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_log.h mod_rewrite.h mod_setenvif.o: mod_setenvif.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_log.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_log.h mod_so.o: mod_so.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_log.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_log.h mod_speling.o: mod_speling.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_log.h + $(INCDIR)/util_uri.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_log.h mod_status.o: mod_status.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/http_main.h $(INCDIR)/util_script.h \ - $(INCDIR)/scoreboard.h $(INCDIR)/http_log.h + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \ + $(INCDIR)/util_script.h $(INCDIR)/scoreboard.h \ + $(INCDIR)/http_log.h mod_unique_id.o: mod_unique_id.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_log.h \ - $(INCDIR)/multithread.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_log.h $(INCDIR)/multithread.h mod_userdir.o: mod_userdir.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h mod_usertrack.o: mod_usertrack.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_core.h + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_core.h