From: Rainer Jung Date: Wed, 1 Feb 2012 09:47:53 +0000 (+0000) Subject: Minor fixes for firehose and mod_policy: X-Git-Tag: 2.5.0-alpha~7518 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11ffbb51b5b55a246584efceb79537d65664ac0a;p=thirdparty%2Fapache%2Fhttpd.git Minor fixes for firehose and mod_policy: - err.h does not exist in Solaris. Judging from the expected content of err.h we don't use it at all, so remove inclusion of it. - The name DEFAULT_TYPE is to generic. Use POLICY_DEFAULT_TYPE instead. - Include apr header files from configured path instead of system path. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1239027 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/test/mod_policy.c b/modules/test/mod_policy.c index b83e1092ca5..d4830aa7681 100644 --- a/modules/test/mod_policy.c +++ b/modules/test/mod_policy.c @@ -36,13 +36,13 @@ #include "http_log.h" #include "http_protocol.h" -#include -#include -#include +#include "apr_tables.h" +#include "apr_strings.h" +#include "apr_date.h" module AP_MODULE_DECLARE_DATA policy_module; -#define DEFAULT_TYPE "*/*" +#define POLICY_DEFAULT_TYPE "*/*" typedef enum policy_result { @@ -207,7 +207,7 @@ static apr_status_t policy_type_out_filter(ap_filter_t *f, type = apr_pstrmemdup(f->r->pool, type, end - type); } if (!conf->type_matches) { - if (!ap_strcmp_match(type, DEFAULT_TYPE)) { + if (!ap_strcmp_match(type, POLICY_DEFAULT_TYPE)) { fail = 0; } } @@ -233,7 +233,7 @@ static apr_status_t policy_type_out_filter(ap_filter_t *f, } } else { - types = DEFAULT_TYPE; + types = POLICY_DEFAULT_TYPE; } handle_policy( diff --git a/support/firehose.c b/support/firehose.c index b2340ade700..b59e4188a70 100644 --- a/support/firehose.c +++ b/support/firehose.c @@ -19,20 +19,18 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "apr.h" +#include "apr_lib.h" +#include "apr_buckets.h" +#include "apr_file_io.h" +#include "apr_file_info.h" +#include "apr_hash.h" +#include "apr_poll.h" +#include "apr_portable.h" +#include "apr_getopt.h" +#include "apr_signal.h" +#include "apr_strings.h" +#include "apr_uuid.h" #if APR_HAVE_STDLIB_H #include #endif