Commit 67db486a authored by Rainer Jung's avatar Rainer Jung
Browse files

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
parent fac8f7fc

modules/test/mod_policy.c

+6 −6
Original line number Diff line number Diff line
@@ -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_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(

support/firehose.c

+12 −14
Original line number Diff line number Diff line
@@ -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