shift some declarations over to mod_core.h where they're totally private.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88226 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/http_core.h b/include/http_core.h
index 1416c1ccfc144ee1f99ceffb57311f561024efb3..05c09bff690bf9e1e4404022426fb0d679d1fc90 100644 (file)
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -137,21 +137,24 @@ extern "C" {
  * @return the Options bitmask
  * @deffunc int ap_allow_options(request_rec *r)
  */
-AP_DECLARE(int) ap_allow_options (request_rec *r);
+AP_DECLARE(int) ap_allow_options(request_rec *r);
+
 /**
  * Retrieve the value of the AllowOverride for this request
  * @param r The current request
  * @return the overrides bitmask
  * @deffunc int ap_allow_overrides(request_rec *r)
  */
-AP_DECLARE(int) ap_allow_overrides (request_rec *r);
+AP_DECLARE(int) ap_allow_overrides(request_rec *r);
+
 /**
  * Retrieve the value of the DefaultType directive, or text/plain if not set
  * @param r The current request
  * @return The default type
  * @deffunc const char *ap_default_type(request_rec *r)
  */
-AP_DECLARE(const char *) ap_default_type (request_rec *r);     
+AP_DECLARE(const char *) ap_default_type(request_rec *r);     
+
 /**
  * Retrieve the document root for this server
  * @param r The current request
@@ -160,7 +163,8 @@ AP_DECLARE(const char *) ap_default_type (request_rec *r);
  * @return The document root
  * @deffunc const char *ap_document_root(request_rec *r)
  */
-AP_DECLARE(const char *) ap_document_root (request_rec *r);
+AP_DECLARE(const char *) ap_document_root(request_rec *r);
+
 /**
  * Lookup the remote client's DNS name or IP address
  * @param conn The current connection
@@ -184,6 +188,7 @@ AP_DECLARE(const char *) ap_document_root (request_rec *r);
  * @deffunc const char *ap_get_remote_host(conn_rec *conn, void *dir_config, int type)
  */
 AP_DECLARE(const char *) ap_get_remote_host(conn_rec *conn, void *dir_config, int type);
+
 /**
  * Retrieve the login name of the remote user.  Undef if it could not be
  * determined
@@ -205,6 +210,7 @@ AP_DECLARE(const char *) ap_get_remote_logname(request_rec *r);
  * @deffunc char *ap_construct_url(apr_pool_t *p, const char *uri, request_rec *r)
  */
 AP_DECLARE(char *) ap_construct_url(apr_pool_t *p, const char *uri, request_rec *r);
+
 /**
  * Get the current server name from the request
  * @param r The current request
@@ -212,6 +218,7 @@ AP_DECLARE(char *) ap_construct_url(apr_pool_t *p, const char *uri, request_rec
  * @deffunc const char *ap_get_server_name(request_rec *r)
  */
 AP_DECLARE(const char *) ap_get_server_name(request_rec *r);
+
 /**
  * Get the current server port
  * @param The current request
@@ -219,6 +226,7 @@ AP_DECLARE(const char *) ap_get_server_name(request_rec *r);
  * @deffunc apr_port_t ap_get_server_port(const request_rec *r)
  */
 AP_DECLARE(apr_port_t) ap_get_server_port(const request_rec *r);
+
 /**
  * Return the limit on bytes in request msg body 
  * @param r The current request
@@ -226,6 +234,7 @@ AP_DECLARE(apr_port_t) ap_get_server_port(const request_rec *r);
  * @deffunc unsigned long ap_get_limit_req_body(const request_rec *r)
  */
 AP_DECLARE(unsigned long) ap_get_limit_req_body(const request_rec *r);
+
 /**
  * Return the limit on bytes in XML request msg body
  * @param r The current request
@@ -233,6 +242,7 @@ AP_DECLARE(unsigned long) ap_get_limit_req_body(const request_rec *r);
  * @deffunc size_t ap_get_limit_xml_body(const request_rec *r)
  */
 AP_DECLARE(size_t) ap_get_limit_xml_body(const request_rec *r);
+
 /**
  * Install a custom response handler for a given status
  * @param r The current request
@@ -242,6 +252,7 @@ AP_DECLARE(size_t) ap_get_limit_xml_body(const request_rec *r);
  * @deffunc void ap_custom_response(request_rec *r, int status, char *string)
  */
 AP_DECLARE(void) ap_custom_response(request_rec *r, int status, char *string);
+
 /**
  * Check for a definition from the server command line
  * @param name The define to check for
@@ -274,14 +285,16 @@ struct require_line {
  * @return The authorization required
  * @deffunc const char *ap_auth_type(request_rec *r)
  */
-AP_DECLARE(const char *) ap_auth_type (request_rec *r);
+AP_DECLARE(const char *) ap_auth_type(request_rec *r);
+
 /**
  * Return the current Authorization realm
  * @param r The current request
  * @return The current authorization realm
  * @deffunc const char *ap_auth_name(request_rec *r)
  */
-AP_DECLARE(const char *) ap_auth_name (request_rec *r);     
+AP_DECLARE(const char *) ap_auth_name(request_rec *r);     
+
 /**
  * How the requires lines must be met.
  * @param r The current request
@@ -293,14 +306,15 @@ AP_DECLARE(const char *) ap_auth_name (request_rec *r);
  * </PRE>
  * @deffunc int ap_satisfies(request_rec *r)
  */
-AP_DECLARE(int) ap_satisfies (request_rec *r);
+AP_DECLARE(int) ap_satisfies(request_rec *r);
+
 /**
  * Retrieve information about all of the requires directives for this request
  * @param r The current request
  * @return An array of all requires directives for this request
  * @deffunc const apr_array_header_t *ap_requires(request_rec *r)
  */
-AP_DECLARE(const apr_array_header_t *) ap_requires (request_rec *r);    
+AP_DECLARE(const apr_array_header_t *) ap_requires(request_rec *r);    
 
 #if defined(WIN32)
 /* 
@@ -324,8 +338,6 @@ AP_DECLARE(file_type_e) ap_get_win32_interpreter(const request_rec *,
  * the code that cares really is in http_core.c.  Also, another accessor.
  */
 
-char *ap_response_code_string (request_rec *r, int error_index);
-
 AP_DECLARE_DATA extern module core_module;
 
 /* Per-request configuration */
@@ -469,10 +481,10 @@ typedef struct {
 void ap_core_reorder_directories(apr_pool_t *, server_rec *);
 
 /* for mod_perl */
-AP_CORE_DECLARE(void) ap_add_per_dir_conf (server_rec *s, void *dir_config);
-AP_CORE_DECLARE(void) ap_add_per_url_conf (server_rec *s, void *url_config);
+AP_CORE_DECLARE(void) ap_add_per_dir_conf(server_rec *s, void *dir_config);
+AP_CORE_DECLARE(void) ap_add_per_url_conf(server_rec *s, void *url_config);
 AP_CORE_DECLARE(void) ap_add_file_conf(core_dir_config *conf, void *url_config);
-AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section (cmd_parms *cmd, void *dummy, const char *arg);
+AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section(cmd_parms *cmd, void *dummy, const char *arg);
 
 #endif
 

diff --git a/include/http_protocol.h b/include/http_protocol.h
index d92534dd44745a31e3d216e5cdcb5b9ebb5ac30a..11d328d849ecb17333af1ce858f60a15beda2358 100644 (file)
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -103,10 +103,6 @@ AP_DECLARE(void) ap_basic_http_header(request_rec *r, apr_bucket_brigade *bb);
  */
 AP_DECLARE(void) ap_send_http_header(request_rec *r);
 
-/* Send the response to special method requests */
-
-AP_DECLARE(int) ap_send_http_trace(request_rec *r);
-int ap_send_http_options(request_rec *r);
 
 /* Finish up stuff after a request */
 
@@ -484,14 +480,6 @@ AP_DECLARE(void) ap_note_digest_auth_failure(request_rec *r);
  */
 AP_DECLARE(int) ap_get_basic_auth_pw(request_rec *r, const char **pw);
 
-/*
- * Setting up the protocol fields for subsidiary requests...
- * Also, a wrapup function to keep the internal accounting straight.
- */
-
-void ap_set_sub_req_protocol(request_rec *rnew, const request_rec *r);
-void ap_finalize_sub_req_protocol(request_rec *sub_r);
-
 /**
  * parse_uri: break apart the uri
  * @warning Side Effects: <PRE>

diff --git a/modules/http/mod_core.h b/modules/http/mod_core.h
index 5e6adb2383732f05debc4544163f92b5587e81fe..c543ea2d96de3f5b1c55f5731b79f8a4809b3147 100644 (file)
--- a/modules/http/mod_core.h
+++ b/modules/http/mod_core.h
@@ -85,6 +85,22 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_old_write_filter(ap_filter_t *f, apr_buc
 apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode_t mode);
 apr_status_t ap_dechunk_filter(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode_t mode);
 
+
+/*
+ * Setting up the protocol fields for subsidiary requests...
+ * Also, a wrapup function to keep the internal accounting straight.
+ */
+void ap_set_sub_req_protocol(request_rec *rnew, const request_rec *r);
+void ap_finalize_sub_req_protocol(request_rec *sub_r);
+
+
+/* Send the response to special method requests */
+int ap_send_http_trace(request_rec *r);
+int ap_send_http_options(request_rec *r);
+
+
+char *ap_response_code_string(request_rec *r, int error_index);
+
 #ifdef __cplusplus
 }
 #endif