summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/ap_listen.h2
-rw-r--r--include/ap_mmn.h21
-rw-r--r--include/ap_release.h2
-rw-r--r--include/http_core.h3
-rw-r--r--include/httpd.h50
5 files changed, 69 insertions, 9 deletions
diff --git a/include/ap_listen.h b/include/ap_listen.h
index 9e3098f2..58c2574f 100644
--- a/include/ap_listen.h
+++ b/include/ap_listen.h
@@ -117,7 +117,7 @@ AP_DECLARE_NONSTD(void) ap_close_listeners(void);
/**
* Loop through the given ap_listen_rec list and close each of the sockets.
- * @param listener The listener to close.
+ * @param listeners The listener to close.
*/
AP_DECLARE_NONSTD(void) ap_close_listeners_ex(ap_listen_rec *listeners);
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 8a28919a..54cbbee4 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -423,13 +423,16 @@
* 20120211.26 (2.4.7-dev) Add util_fcgi.h, FastCGI protocol support
* 20120211.27 (2.4.7-dev) Add ap_podx_restart_t and ap_mpm_podx_*
* 20120211.28 (2.4.7-dev) Add ap_regname
- * 20120211.29 (2.4.7-dev) Add uds_path to proxy_conn_rec
+ * 20120211.29 (2.4.7-dev) Add uds_path to proxy_conn_rec and proxy_worker_shared.
+ * The change to proxy_worker_shared is an
+ * unintended API break, especially for balancer
+ * lbmethod modules.
* 20120211.30 (2.4.7-dev) REWRITE_REDIRECT_HANDLER_NAME in mod_rewrite.h
* 20120211.31 (2.4.7-dev) Add ap_proxy_port_of_scheme()
* 20120211.32 (2.4.10-dev) Add SSL reusable SNI to mod_proxy.h's proxy_conn_rec
* 20120211.33 (2.4.10-dev) Add suspend_connection and resume_connection hooks
* 20120211.34 (2.4.10-dev) AP_DEFAULT_HANDLER_NAME/AP_IS_DEFAULT_HANDLER_NAME
- * 20120211.35 (2.4.10-dev) Add "r", "must_rebind", and last_backend_conn
+ * 20120211.35 (2.4.10-dev) Add "r", "must_rebind", and last_backend_conn
to util_ldap_connection_t
* 20120211.36 (2.4.10-dev) Add ap_copy_scoreboard_worker()
* 20120211.37 (2.4.11-dev) Add r->trailers_{in,out}
@@ -439,7 +442,7 @@
* 20120211.41 (2.4.11-dev) Add ap_proxy_de_socketfy to mod_proxy.h
* 20120211.42 (2.4.13-dev) Add response_code_exprs to http_core.h
* 20120211.43 (2.4.13-dev) Add keep_alive_timeout_set to server_rec
- * 20120211.44 (2.4.13-dev) Add cgi_pass_auth and AP_CGI_PASS_AUTH_* to
+ * 20120211.44 (2.4.13-dev) Add cgi_pass_auth and AP_CGI_PASS_AUTH_* to
* core_dir_config
* 20120211.45 (2.4.13-dev) Add ap_proxy_connection_reusable()
* 20120211.46 (2.4.13-dev) Add ap_map_http_request_error()
@@ -457,17 +460,23 @@
* ap_get_protocol(). Add HTTP_MISDIRECTED_REQUEST.
* Added ap_parse_token_list_strict() to httpd.h
* 20120211.52 (2.4.17-dev) Add master conn_rec* member in conn_rec.
- * 20120211.53 (2.4.19-dev) Add epxr_hander to core_dir_config.
+ * 20120211.53 (2.4.19-dev) Add expr_handler to core_dir_config.
* 20120211.54 (2.4.19-dev) Add ap_proxy_buckets_lifetime_transform and
* ap_proxy_transfer_between_connections to
* mod_proxy.h
* 20120211.55 (2.4.19-dev) Add new ap_update_child_status...() methods,
* add protocol to worker_score in scoreboard.h,
- * Add pre_close connection hook and
+ * Add pre_close connection hook and
* ap_prep_lingering_close().
* 20120211.56 (2.4.19-dev) Split useragent_host from the conn_rec into
* the request_rec, with ap_get_useragent_host()
* 20120211.57 (2.4.19-dev) Add mod_ssl_openssl.h and OpenSSL-specific hooks
+ * 20120211.58 (2.4.21-dev) Add cgi_var_rules to core_dir_config.
+ * 20120211.59 (2.4.21-dev) Add ap_getword_conf2[_nc](),
+ * ap_proxy_is_socket_connected() and
+ * extended proxy_worker_shared.
+ * 20120211.60 (2.4.21-dev) Add dav_get_provider_name.
+ * 20120211.61 (2.4.21-dev) Add ap_cstr_casecmp[n]() - placeholder of apr_ fns
*/
#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -475,7 +484,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20120211
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 57 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 61 /* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
diff --git a/include/ap_release.h b/include/ap_release.h
index becf09cf..2c5e13c0 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -43,7 +43,7 @@
#define AP_SERVER_MAJORVERSION_NUMBER 2
#define AP_SERVER_MINORVERSION_NUMBER 4
-#define AP_SERVER_PATCHLEVEL_NUMBER 20
+#define AP_SERVER_PATCHLEVEL_NUMBER 23
#define AP_SERVER_DEVBUILD_BOOLEAN 0
/* Synchronize the above with docs/manual/style/version.ent */
diff --git a/include/http_core.h b/include/http_core.h
index d39546f7..2590b22d 100644
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -669,6 +669,9 @@ typedef struct {
unsigned int cgi_pass_auth : 2;
unsigned int qualify_redirect_url :2;
ap_expr_info_t *expr_handler; /* forced with SetHandler */
+
+ /** Table of rules for building CGI variables, NULL if none configured */
+ apr_hash_t *cgi_var_rules;
} core_dir_config;
/* macro to implement off by default behaviour */
diff --git a/include/httpd.h b/include/httpd.h
index 69e6e3a2..5035a610 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -481,7 +481,7 @@ AP_DECLARE(const char *) ap_get_server_built(void);
* When adding a new code here add it to status_lines as well.
* A future version should dynamically generate the apr_table_t at startup.
*/
-#define RESPONSE_CODES 83
+#define RESPONSE_CODES 103
#define HTTP_CONTINUE 100
#define HTTP_SWITCHING_PROTOCOLS 101
@@ -530,6 +530,7 @@ AP_DECLARE(const char *) ap_get_server_built(void);
#define HTTP_PRECONDITION_REQUIRED 428
#define HTTP_TOO_MANY_REQUESTS 429
#define HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE 431
+#define HTTP_UNAVAILABLE_FOR_LEGAL_REASONS 451
#define HTTP_INTERNAL_SERVER_ERROR 500
#define HTTP_NOT_IMPLEMENTED 501
#define HTTP_BAD_GATEWAY 502
@@ -1503,6 +1504,25 @@ AP_DECLARE(char *) ap_getword_conf(apr_pool_t *p, const char **line);
AP_DECLARE(char *) ap_getword_conf_nc(apr_pool_t *p, char **line);
/**
+ * Get the second word in the string paying attention to quoting,
+ * with {...} supported as well as "..." and '...'
+ * @param p The pool to allocate from
+ * @param line The line to traverse
+ * @return A copy of the string
+ */
+AP_DECLARE(char *) ap_getword_conf2(apr_pool_t *p, const char **line);
+
+/**
+ * Get the second word in the string paying attention to quoting,
+ * with {...} supported as well as "..." and '...'
+ * @param p The pool to allocate from
+ * @param line The line to traverse
+ * @return A copy of the string
+ * @note The same as ap_getword_conf2(), except it doesn't use const char **.
+ */
+AP_DECLARE(char *) ap_getword_conf2_nc(apr_pool_t *p, char **line);
+
+/**
* Check a string for any config define or environment variable construct
* and replace each of them by the value of that variable, if it exists.
* The default syntax of the constructs is ${ENV} but can be changed by
@@ -2321,6 +2341,34 @@ AP_DECLARE(int) ap_array_str_index(const apr_array_header_t *array,
AP_DECLARE(int) ap_array_str_contains(const apr_array_header_t *array,
const char *s);
+/**
+ * Perform a case-insensitive comparison of two strings @a atr1 and @a atr2,
+ * treating upper and lower case values of the 26 standard C/POSIX alphabetic
+ * characters as equivalent. Extended latin characters outside of this set
+ * are treated as unique octets, irrespective of the current locale.
+ *
+ * Returns in integer greater than, equal to, or less than 0,
+ * according to whether @a str1 is considered greater than, equal to,
+ * or less than @a str2.
+ *
+ * @note Same code as apr_cstr_casecmp, which arrives in APR 1.6
+ */
+AP_DECLARE(int) ap_cstr_casecmp(const char *s1, const char *s2);
+
+/**
+ * Perform a case-insensitive comparison of two strings @a atr1 and @a atr2,
+ * treating upper and lower case values of the 26 standard C/POSIX alphabetic
+ * characters as equivalent. Extended latin characters outside of this set
+ * are treated as unique octets, irrespective of the current locale.
+ *
+ * Returns in integer greater than, equal to, or less than 0,
+ * according to whether @a str1 is considered greater than, equal to,
+ * or less than @a str2.
+ *
+ * @note Same code as apr_cstr_casecmpn, which arrives in APR 1.6
+ */
+AP_DECLARE(int) ap_cstr_casecmpn(const char *s1, const char *s2, apr_size_t n);
+
#ifdef __cplusplus
}
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 20:00:55 +0000