www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

Fix mess left by incompleteness of previous ProxyPassReverse fix

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232247 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Kew
2005-08-12 09:38:09 +00:00
parent 1e9e5a69cb
commit ab0fd007b9
5 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/proxy/ajp.h
View File

@@ -442,7 +442,7 @@ int ajp_parse_type(request_rec *r, ajp_msg_t *msg);
* @param msg AJP message * @param msg AJP message
* @return APR_SUCCESS or error * @return APR_SUCCESS or error
*/ */
apr_status_t ajp_parse_header(request_rec *r, proxy_server_conf *conf, apr_status_t ajp_parse_header(request_rec *r, proxy_dir_conf *conf,
ajp_msg_t *msg); ajp_msg_t *msg);
/** /**

8
modules/proxy/ajp_header.c
View File

@@ -447,7 +447,7 @@ body_chunk :=
static apr_status_t ajp_unmarshal_response(ajp_msg_t *msg, static apr_status_t ajp_unmarshal_response(ajp_msg_t *msg,
request_rec *r, request_rec *r,
proxy_server_conf *conf) proxy_dir_conf *dconf)
{ {
apr_uint16_t status; apr_uint16_t status;
apr_status_t rc; apr_status_t rc;
@@ -532,7 +532,7 @@ static apr_status_t ajp_unmarshal_response(ajp_msg_t *msg,
/* Set-Cookie need additional processing */ /* Set-Cookie need additional processing */
if (!strcasecmp(stringname, "Set-Cookie")) { if (!strcasecmp(stringname, "Set-Cookie")) {
value = ap_proxy_cookie_reverse_map(r, conf, value); value = ap_proxy_cookie_reverse_map(r, dconf, value);
} }
/* Location, Content-Location, URI and Destination need additional /* Location, Content-Location, URI and Destination need additional
* processing */ * processing */
@@ -541,7 +541,7 @@ static apr_status_t ajp_unmarshal_response(ajp_msg_t *msg,
|| !strcasecmp(stringname, "URI") || !strcasecmp(stringname, "URI")
|| !strcasecmp(stringname, "Destination")) || !strcasecmp(stringname, "Destination"))
{ {
value = ap_proxy_location_reverse_map(r, conf, value); value = ap_proxy_location_reverse_map(r, dconf, value);
} }
#if defined(AS400) || defined(_OSD_POSIX) #if defined(AS400) || defined(_OSD_POSIX)
@@ -639,7 +639,7 @@ int ajp_parse_type(request_rec *r, ajp_msg_t *msg)
} }
/* parse the header */ /* parse the header */
apr_status_t ajp_parse_header(request_rec *r, proxy_server_conf *conf, apr_status_t ajp_parse_header(request_rec *r, proxy_dir_conf *conf,
ajp_msg_t *msg) ajp_msg_t *msg)
{ {
apr_byte_t result; apr_byte_t result;

12
modules/proxy/mod_proxy.h
View File

@@ -424,23 +424,23 @@ PROXY_DECLARE(int) ap_proxy_conn_is_https(conn_rec *c);
PROXY_DECLARE(const char *) ap_proxy_ssl_val(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r, const char *var); PROXY_DECLARE(const char *) ap_proxy_ssl_val(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r, const char *var);
/* Header mapping functions, and a typedef of their signature */ /* Header mapping functions, and a typedef of their signature */
PROXY_DECLARE(const char *) ap_proxy_location_reverse_map(request_rec *r, proxy_server_conf *conf, const char *url); PROXY_DECLARE(const char *) ap_proxy_location_reverse_map(request_rec *r, proxy_dir_conf *conf, const char *url);
PROXY_DECLARE(const char *) ap_proxy_cookie_reverse_map(request_rec *r, proxy_server_conf *conf, const char *str); PROXY_DECLARE(const char *) ap_proxy_cookie_reverse_map(request_rec *r, proxy_dir_conf *conf, const char *str);
#if !defined(WIN32) #if !defined(WIN32)
typedef const char *(*ap_proxy_header_reverse_map_fn)(request_rec *, typedef const char *(*ap_proxy_header_reverse_map_fn)(request_rec *,
proxy_server_conf *, const char *); proxy_dir_conf *, const char *);
#elif defined(PROXY_DECLARE_STATIC) #elif defined(PROXY_DECLARE_STATIC)
typedef const char *(__stdcall *ap_proxy_header_reverse_map_fn)(request_rec *, typedef const char *(__stdcall *ap_proxy_header_reverse_map_fn)(request_rec *,
proxy_server_conf *, const char *); proxy_dir_conf *, const char *);
#elif defined(PROXY_DECLARE_EXPORT) #elif defined(PROXY_DECLARE_EXPORT)
typedef __declspec(dllexport) const char * typedef __declspec(dllexport) const char *
(__stdcall *ap_proxy_header_reverse_map_fn)(request_rec *, (__stdcall *ap_proxy_header_reverse_map_fn)(request_rec *,
proxy_server_conf *, const char *); proxy_dir_conf *, const char *);
#else #else
typedef __declspec(dllimport) const char * typedef __declspec(dllimport) const char *
(__stdcall *ap_proxy_header_reverse_map_fn)(request_rec *, (__stdcall *ap_proxy_header_reverse_map_fn)(request_rec *,
proxy_server_conf *, const char *); proxy_dir_conf *, const char *);
#endif #endif

6
modules/proxy/mod_proxy_ajp.c
View File

@@ -88,7 +88,7 @@ static int proxy_ajp_canon(request_rec *r, char *url)
static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r, static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
proxy_conn_rec *conn, proxy_conn_rec *conn,
conn_rec *origin, conn_rec *origin,
proxy_server_conf *conf, proxy_dir_conf *conf,
apr_uri_t *uri, apr_uri_t *uri,
char *url, char *server_portstr) char *url, char *server_portstr)
{ {
@@ -348,6 +348,8 @@ static int proxy_ajp_handler(request_rec *r, proxy_worker *worker,
conn_rec *origin = NULL; conn_rec *origin = NULL;
proxy_conn_rec *backend = NULL; proxy_conn_rec *backend = NULL;
const char *scheme = "AJP"; const char *scheme = "AJP";
proxy_dir_conf *dconf = ap_get_module_config(r->per_dir_config,
&proxy_module);
/* Note: Memory pool allocation. /* Note: Memory pool allocation.
* A downstream keepalive connection is always connected to the existence * A downstream keepalive connection is always connected to the existence
@@ -436,7 +438,7 @@ static int proxy_ajp_handler(request_rec *r, proxy_worker *worker,
/* Step Four: Process the Request */ /* Step Four: Process the Request */
status = ap_proxy_ajp_request(p, r, backend, origin, conf, uri, url, status = ap_proxy_ajp_request(p, r, backend, origin, dconf, uri, url,
server_portstr); server_portstr);
if (status != OK) if (status != OK)
goto cleanup; goto cleanup;

4
modules/proxy/proxy_util.c
View File

@@ -1002,7 +1002,7 @@ PROXY_DECLARE(void) ap_proxy_table_unmerge(apr_pool_t *p, apr_table_t *t, char *
} }
PROXY_DECLARE(const char *) ap_proxy_location_reverse_map(request_rec *r, PROXY_DECLARE(const char *) ap_proxy_location_reverse_map(request_rec *r,
proxy_server_conf *conf, const char *url) proxy_dir_conf *conf, const char *url)
{ {
struct proxy_alias *ent; struct proxy_alias *ent;
int i, l1, l2; int i, l1, l2;
@@ -1031,7 +1031,7 @@ PROXY_DECLARE(const char *) ap_proxy_location_reverse_map(request_rec *r,
* and stick to plain strings for the config values. * and stick to plain strings for the config values.
*/ */
PROXY_DECLARE(const char *) ap_proxy_cookie_reverse_map(request_rec *r, PROXY_DECLARE(const char *) ap_proxy_cookie_reverse_map(request_rec *r,
proxy_server_conf *conf, const char *str) proxy_dir_conf *conf, const char *str)
{ {
struct proxy_alias *ent; struct proxy_alias *ent;
size_t len = strlen(str); size_t len = strlen(str);