From 22d9fbdec042264bb0eb22d3c6a060e477791ab1 Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Fri, 21 Jul 2000 19:50:58 +0000 Subject: [PATCH] Move all APR functions related to strings to their own directory, and create a new header for those functions. This is the first step to removing the apr/lib directory completely, and moving those files/functions to descriptive directories. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85867 13f79535-47bb-0310-9956-ffa450edef68 --- modules/aaa/mod_access.c | 1 + modules/aaa/mod_auth.c | 1 + modules/filters/mod_include.c | 1 + modules/generators/mod_asis.c | 1 + modules/generators/mod_autoindex.c | 1 + modules/generators/mod_cgi.c | 1 + modules/generators/mod_cgid.c | 1 + modules/http/http_core.c | 1 + modules/http/http_protocol.c | 1 + modules/http/http_request.c | 1 + modules/http/mod_mime.c | 1 + modules/loggers/mod_log_config.c | 1 + modules/mappers/mod_actions.c | 1 + modules/mappers/mod_alias.c | 1 + modules/mappers/mod_dir.c | 1 + modules/mappers/mod_imap.c | 1 + modules/mappers/mod_negotiation.c | 1 + modules/mappers/mod_userdir.c | 1 + modules/metadata/mod_env.c | 1 + modules/metadata/mod_setenvif.c | 1 + server/config.c | 1 + server/connection.c | 1 + server/listen.c | 1 + server/log.c | 1 + server/main.c | 1 + server/mpm/beos/beos.c | 1 + server/mpm/dexter/dexter.c | 1 + server/mpm/mpmt_beos/mpmt_beos.c | 1 + server/mpm/mpmt_pthread/mpmt_pthread.c | 1 + server/mpm/prefork/prefork.c | 1 + server/util.c | 1 + server/util_md5.c | 1 + server/util_script.c | 1 + server/util_uri.c | 1 + server/util_xml.c | 1 + server/vhost.c | 1 + support/htpasswd.c | 1 + 37 files changed, 37 insertions(+) diff --git a/modules/aaa/mod_access.c b/modules/aaa/mod_access.c index 5b634bcfe8..592d9260fa 100644 --- a/modules/aaa/mod_access.c +++ b/modules/aaa/mod_access.c @@ -63,6 +63,7 @@ * */ +#include "apr_strings.h" #include "apr_network_io.h" #include "ap_config.h" #include "httpd.h" diff --git a/modules/aaa/mod_auth.c b/modules/aaa/mod_auth.c index 8b5a875987..e09ea87cb3 100644 --- a/modules/aaa/mod_auth.c +++ b/modules/aaa/mod_auth.c @@ -71,6 +71,7 @@ */ #include "ap_config.h" +#include "apr_strings.h" #include "apr_md5.h" #include "httpd.h" #include "http_config.h" diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c index ad9cf916a9..4209150800 100644 --- a/modules/filters/mod_include.c +++ b/modules/filters/mod_include.c @@ -87,6 +87,7 @@ #endif #include "modules/perl/mod_perl.h" #else +#include "apr_strings.h" #include "ap_config.h" #include "httpd.h" #include "http_config.h" diff --git a/modules/generators/mod_asis.c b/modules/generators/mod_asis.c index 4048008565..2e5c6e4ed1 100644 --- a/modules/generators/mod_asis.c +++ b/modules/generators/mod_asis.c @@ -56,6 +56,7 @@ * University of Illinois, Urbana-Champaign. */ +#include "apr_strings.h" #include "ap_config.h" #include "httpd.h" #include "http_config.h" diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c index 5f2060ce28..84435b3d83 100644 --- a/modules/generators/mod_autoindex.c +++ b/modules/generators/mod_autoindex.c @@ -66,6 +66,7 @@ * * Version sort added by Martin Pool . */ +#include "apr_strings.h" #include "ap_config.h" #include "httpd.h" #include "http_config.h" diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c index 5e25811a02..3bde51f3d9 100644 --- a/modules/generators/mod_cgi.c +++ b/modules/generators/mod_cgi.c @@ -71,6 +71,7 @@ #define CORE_PRIVATE +#include "apr_strings.h" #include "ap_config.h" #include "httpd.h" #include "http_config.h" diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c index 0ec7ab7b11..ffbf332f62 100644 --- a/modules/generators/mod_cgid.c +++ b/modules/generators/mod_cgid.c @@ -74,6 +74,7 @@ #define CORE_PRIVATE #include "apr_lib.h" +#include "apr_strings.h" #include "apr_general.h" #include "apr_file_io.h" #include "apr_portable.h" diff --git a/modules/http/http_core.c b/modules/http/http_core.c index 3224cb7f57..f6d4827d46 100644 --- a/modules/http/http_core.c +++ b/modules/http/http_core.c @@ -58,6 +58,7 @@ #define CORE_PRIVATE #include "ap_config.h" +#include "apr_strings.h" #include "apr_lib.h" #include "httpd.h" #include "http_config.h" diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index 24dfead1a0..33f67da9ca 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -65,6 +65,7 @@ #define CORE_PRIVATE #include "ap_config.h" +#include "apr_strings.h" #include "httpd.h" #include "http_config.h" #include "http_core.h" diff --git a/modules/http/http_request.c b/modules/http/http_request.c index af9aafa552..4c3e9730a3 100644 --- a/modules/http/http_request.c +++ b/modules/http/http_request.c @@ -76,6 +76,7 @@ #include "http_log.h" #include "http_main.h" #include "util_charset.h" +#include "apr_strings.h" #include "apr_file_io.h" #include "apr_fnmatch.h" diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c index 6982a843bc..3c606eaf73 100644 --- a/modules/http/mod_mime.c +++ b/modules/http/mod_mime.c @@ -65,6 +65,7 @@ #define MIME_PRIVATE +#include "apr_strings.h" #include "ap_config.h" #include "httpd.h" #include "http_config.h" diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c index 10bd9d1035..0db20c44a3 100644 --- a/modules/loggers/mod_log_config.c +++ b/modules/loggers/mod_log_config.c @@ -170,6 +170,7 @@ #define DEFAULT_LOG_FORMAT "%h %l %u %t \"%r\" %>s %b" +#include "apr_strings.h" #include "ap_config.h" #include "httpd.h" #include "http_config.h" diff --git a/modules/mappers/mod_actions.c b/modules/mappers/mod_actions.c index 23c007cf09..a8db173514 100644 --- a/modules/mappers/mod_actions.c +++ b/modules/mappers/mod_actions.c @@ -78,6 +78,7 @@ * URI includes query information (stuff after a ?-mark). */ +#include "apr_strings.h" #include "ap_config.h" #include "httpd.h" #include "http_config.h" diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c index c99bc699e9..b41dfc6ccf 100644 --- a/modules/mappers/mod_alias.c +++ b/modules/mappers/mod_alias.c @@ -64,6 +64,7 @@ * */ +#include "apr_strings.h" #include "ap_config.h" #include "httpd.h" #include "http_config.h" diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c index 962209eac9..eddfd0d8de 100644 --- a/modules/mappers/mod_dir.c +++ b/modules/mappers/mod_dir.c @@ -60,6 +60,7 @@ * mod_dir.c: handle default index files, and trailing-/ redirects */ +#include "apr_strings.h" #include "ap_config.h" #include "httpd.h" #include "http_config.h" diff --git a/modules/mappers/mod_imap.c b/modules/mappers/mod_imap.c index 8ed283f626..c7fced93d8 100644 --- a/modules/mappers/mod_imap.c +++ b/modules/mappers/mod_imap.c @@ -92,6 +92,7 @@ * Mark Cox, mark@ukweb.com, Allow relative URLs even when no base specified */ +#include "apr_strings.h" #include "ap_config.h" #include "httpd.h" #include "http_config.h" diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c index b9353fca5d..57b2285473 100644 --- a/modules/mappers/mod_negotiation.c +++ b/modules/mappers/mod_negotiation.c @@ -64,6 +64,7 @@ */ #include "ap_config.h" +#include "apr_strings.h" #include "apr_file_io.h" #include "httpd.h" #include "http_config.h" diff --git a/modules/mappers/mod_userdir.c b/modules/mappers/mod_userdir.c index 9679068171..ce44971424 100644 --- a/modules/mappers/mod_userdir.c +++ b/modules/mappers/mod_userdir.c @@ -91,6 +91,7 @@ * disabled, except those explicitly turned on with the "enabled" keyword. */ +#include "apr_strings.h" #include "ap_config.h" #include "httpd.h" #include "http_config.h" diff --git a/modules/metadata/mod_env.c b/modules/metadata/mod_env.c index 0fd7ff68a3..0eaf0d1f69 100644 --- a/modules/metadata/mod_env.c +++ b/modules/metadata/mod_env.c @@ -99,6 +99,7 @@ * *** older versions of the module. *** */ +#include "apr_strings.h" #include "ap_config.h" #include "httpd.h" #include "http_config.h" diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c index 90edbc5cd0..147a978adc 100644 --- a/modules/metadata/mod_setenvif.c +++ b/modules/metadata/mod_setenvif.c @@ -115,6 +115,7 @@ * SetEnvIf remote_addr (127.0.0.1|192.168.10.) LOCAL */ +#include "apr_strings.h" #include "ap_config.h" #include "httpd.h" #include "http_config.h" diff --git a/server/config.c b/server/config.c index c4448b1546..6d4ce013ed 100644 --- a/server/config.c +++ b/server/config.c @@ -75,6 +75,7 @@ #include "ap_config.h" #include "apr_portable.h" +#include "apr_strings.h" #include "apr_file_io.h" #include "httpd.h" #include "http_config.h" diff --git a/server/connection.c b/server/connection.c index c975038ee8..089553476e 100644 --- a/server/connection.c +++ b/server/connection.c @@ -58,6 +58,7 @@ #define CORE_PRIVATE #include "ap_config.h" +#include "apr_strings.h" #include "httpd.h" #include "http_connection.h" #include "http_request.h" diff --git a/server/listen.c b/server/listen.c index 00fdfca1e7..1c9627a9a8 100644 --- a/server/listen.c +++ b/server/listen.c @@ -63,6 +63,7 @@ #include "httpd.h" #include "http_config.h" #include "ap_listen.h" +#include "apr_strings.h" #include "http_log.h" #include "mpm.h" #ifdef HAVE_STRING_H diff --git a/server/log.c b/server/log.c index ecbe9e96e5..880e7d1bad 100644 --- a/server/log.c +++ b/server/log.c @@ -67,6 +67,7 @@ #define CORE_PRIVATE #include "apr.h" /* for ap_signal */ #include "ap_config.h" +#include "apr_strings.h" #include "apr_lib.h" #include "apr_portable.h" #include "httpd.h" diff --git a/server/main.c b/server/main.c index ef9b15d831..4e36b7568e 100644 --- a/server/main.c +++ b/server/main.c @@ -65,6 +65,7 @@ #include "http_vhost.h" #include "util_uri.h" #include "util_ebcdic.h" +#include "apr_strings.h" #include "apr_getopt.h" #include "ap_mpm.h" diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c index aece0cda86..e985497b48 100644 --- a/server/mpm/beos/beos.c +++ b/server/mpm/beos/beos.c @@ -66,6 +66,7 @@ ap_/* ==================================================================== #define CORE_PRIVATE +#include "apr_strings.h" #include "apr_portable.h" #include "httpd.h" #include "http_main.h" diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c index 61f2620411..dc1c6e58b9 100644 --- a/server/mpm/dexter/dexter.c +++ b/server/mpm/dexter/dexter.c @@ -60,6 +60,7 @@ #include "ap_config.h" #include "apr_portable.h" +#include "apr_strings.h" #include "apr_file_io.h" #include "httpd.h" #include "http_main.h" diff --git a/server/mpm/mpmt_beos/mpmt_beos.c b/server/mpm/mpmt_beos/mpmt_beos.c index 5f4899003f..c37a7681d2 100644 --- a/server/mpm/mpmt_beos/mpmt_beos.c +++ b/server/mpm/mpmt_beos/mpmt_beos.c @@ -62,6 +62,7 @@ #define CORE_PRIVATE +#include "apr_strings.h" #include "apr_portable.h" #include "httpd.h" #include "http_main.h" diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c index dbece3e21b..8f5cdb7ea7 100644 --- a/server/mpm/mpmt_pthread/mpmt_pthread.c +++ b/server/mpm/mpmt_pthread/mpmt_pthread.c @@ -59,6 +59,7 @@ #define CORE_PRIVATE #include "apr_portable.h" +#include "apr_strings.h" #include "apr_file_io.h" #include "apr_thread_proc.h" #include "ap_config.h" diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 0910c8a367..e32911b140 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -89,6 +89,7 @@ #include "ap_config.h" #include "apr_portable.h" +#include "apr_strings.h" #include "apr_thread_proc.h" #include "httpd.h" #include "mpm_default.h" diff --git a/server/util.c b/server/util.c index 09e9758335..061355e8e4 100644 --- a/server/util.c +++ b/server/util.c @@ -73,6 +73,7 @@ #include "ap_config.h" #include "ap_base64.h" +#include "apr_strings.h" #include "httpd.h" #include "http_main.h" #include "http_log.h" diff --git a/server/util_md5.c b/server/util_md5.c index 12f103827b..a4faf92166 100644 --- a/server/util_md5.c +++ b/server/util_md5.c @@ -87,6 +87,7 @@ #include "ap_config.h" #include "apr_portable.h" +#include "apr_strings.h" #include "httpd.h" #include "util_md5.h" #include "util_ebcdic.h" diff --git a/server/util_script.c b/server/util_script.c index eefc95c393..621134b203 100644 --- a/server/util_script.c +++ b/server/util_script.c @@ -58,6 +58,7 @@ #define CORE_PRIVATE #include "ap_config.h" +#include "apr_strings.h" #include "httpd.h" #include "http_config.h" #include "http_main.h" diff --git a/server/util_uri.c b/server/util_uri.c index 6d6a39bd56..2eab6d2d35 100644 --- a/server/util_uri.c +++ b/server/util_uri.c @@ -62,6 +62,7 @@ */ #include "ap_config.h" +#include "apr_strings.h" #include "httpd.h" #include "http_log.h" #include "util_uri.h" diff --git a/server/util_xml.c b/server/util_xml.c index 44897edaa5..d0f25a7058 100644 --- a/server/util_xml.c +++ b/server/util_xml.c @@ -64,6 +64,7 @@ #include "http_protocol.h" #include "http_log.h" #include "http_core.h" +#include "apr_strings.h" #include "util_xml.h" diff --git a/server/vhost.c b/server/vhost.c index b3b72c2b83..aa387d37a4 100644 --- a/server/vhost.c +++ b/server/vhost.c @@ -69,6 +69,7 @@ #include "http_vhost.h" #include "http_protocol.h" #include "http_core.h" +#include "apr_strings.h" #ifdef HAVE_ARPA_INET_H #include diff --git a/support/htpasswd.c b/support/htpasswd.c index ad5b1ed490..874d7dd969 100644 --- a/support/htpasswd.c +++ b/support/htpasswd.c @@ -79,6 +79,7 @@ * 6: Failure; username contains illegal or reserved characters */ +#include "apr_strings.h" #include "apr_lib.h" #include "apr_errno.h" #include "ap_config.h" -- 2.50.1