shift some declarations over to mod_core.h where they're totally private. (67e10952) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

include/http_core.h

+25 −13

Original line number	Diff line number	Diff line
		@@ -138,6 +138,7 @@ extern "C" {
		* @deffunc 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
		@@ -145,6 +146,7 @@ AP_DECLARE(int) ap_allow_options (request_rec *r);
		* @deffunc 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
		@@ -152,6 +154,7 @@ AP_DECLARE(int) ap_allow_overrides (request_rec *r);
		* @deffunc 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
		@@ -161,6 +164,7 @@ AP_DECLARE(const char ) ap_default_type (request_rec r);
		* @deffunc 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
		@@ -275,6 +286,7 @@ struct require_line {
		* @deffunc 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
		@@ -282,6 +294,7 @@ AP_DECLARE(const char ) ap_auth_type (request_rec r);
		* @deffunc 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
		@@ -294,6 +307,7 @@ AP_DECLARE(const char ) ap_auth_name (request_rec r);
		* @deffunc 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
		@@ -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 */

include/http_protocol.h

+0 −12

Original line number	Diff line number	Diff line
		@@ -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>

modules/http/mod_core.h

+16 −0

Original line number	Diff line number	Diff line
		@@ -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