You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2012/02/01 10:47:53 UTC
svn commit: r1239027 - in /httpd/httpd/trunk: modules/test/mod_policy.c
support/firehose.c
Author: rjung
Date: Wed Feb 1 09:47:53 2012
New Revision: 1239027
URL: http://svn.apache.org/viewvc?rev=1239027&view=rev
Log:
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.
Modified:
httpd/httpd/trunk/modules/test/mod_policy.c
httpd/httpd/trunk/support/firehose.c
Modified: httpd/httpd/trunk/modules/test/mod_policy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/test/mod_policy.c?rev=1239027&r1=1239026&r2=1239027&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/test/mod_policy.c (original)
+++ httpd/httpd/trunk/modules/test/mod_policy.c Wed Feb 1 09:47:53 2012
@@ -36,13 +36,13 @@
#include "http_log.h"
#include "http_protocol.h"
-#include <apr_tables.h>
-#include <apr_strings.h>
-#include <apr_date.h>
+#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_filt
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_filt
}
}
else {
- types = DEFAULT_TYPE;
+ types = POLICY_DEFAULT_TYPE;
}
handle_policy(
Modified: httpd/httpd/trunk/support/firehose.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/firehose.c?rev=1239027&r1=1239026&r2=1239027&view=diff
==============================================================================
--- httpd/httpd/trunk/support/firehose.c (original)
+++ httpd/httpd/trunk/support/firehose.c Wed Feb 1 09:47:53 2012
@@ -19,20 +19,18 @@
*
*/
-#include <err.h>
-#include <apr.h>
-#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>
+#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 <stdlib.h>
#endif