You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2005/08/12 11:38:14 UTC
svn commit: r232247 - in /httpd/httpd/trunk/modules/proxy: ajp.h
ajp_header.c mod_proxy.h mod_proxy_ajp.c proxy_util.c
Author: niq
Date: Fri Aug 12 02:38:09 2005
New Revision: 232247
URL: http://svn.apache.org/viewcvs?rev=232247&view=rev
Log:
Fix mess left by incompleteness of previous ProxyPassReverse fix
Modified:
httpd/httpd/trunk/modules/proxy/ajp.h
httpd/httpd/trunk/modules/proxy/ajp_header.c
httpd/httpd/trunk/modules/proxy/mod_proxy.h
httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/modules/proxy/ajp.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/ajp.h?rev=232247&r1=232246&r2=232247&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/ajp.h (original)
+++ httpd/httpd/trunk/modules/proxy/ajp.h Fri Aug 12 02:38:09 2005
@@ -442,7 +442,7 @@
* @param msg AJP message
* @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);
/**
Modified: httpd/httpd/trunk/modules/proxy/ajp_header.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/ajp_header.c?rev=232247&r1=232246&r2=232247&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/ajp_header.c (original)
+++ httpd/httpd/trunk/modules/proxy/ajp_header.c Fri Aug 12 02:38:09 2005
@@ -447,7 +447,7 @@
static apr_status_t ajp_unmarshal_response(ajp_msg_t *msg,
request_rec *r,
- proxy_server_conf *conf)
+ proxy_dir_conf *dconf)
{
apr_uint16_t status;
apr_status_t rc;
@@ -532,7 +532,7 @@
/* Set-Cookie need additional processing */
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
* processing */
@@ -541,7 +541,7 @@
|| !strcasecmp(stringname, "URI")
|| !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)
@@ -639,7 +639,7 @@
}
/* 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)
{
apr_byte_t result;
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=232247&r1=232246&r2=232247&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Fri Aug 12 02:38:09 2005
@@ -424,23 +424,23 @@
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 */
-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_cookie_reverse_map(request_rec *r, proxy_server_conf *conf, const char *str);
+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_dir_conf *conf, const char *str);
#if !defined(WIN32)
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)
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)
typedef __declspec(dllexport) const char *
(__stdcall *ap_proxy_header_reverse_map_fn)(request_rec *,
- proxy_server_conf *, const char *);
+ proxy_dir_conf *, const char *);
#else
typedef __declspec(dllimport) const char *
(__stdcall *ap_proxy_header_reverse_map_fn)(request_rec *,
- proxy_server_conf *, const char *);
+ proxy_dir_conf *, const char *);
#endif
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c?rev=232247&r1=232246&r2=232247&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c Fri Aug 12 02:38:09 2005
@@ -88,7 +88,7 @@
static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
proxy_conn_rec *conn,
conn_rec *origin,
- proxy_server_conf *conf,
+ proxy_dir_conf *conf,
apr_uri_t *uri,
char *url, char *server_portstr)
{
@@ -348,6 +348,8 @@
conn_rec *origin = NULL;
proxy_conn_rec *backend = NULL;
const char *scheme = "AJP";
+ proxy_dir_conf *dconf = ap_get_module_config(r->per_dir_config,
+ &proxy_module);
/* Note: Memory pool allocation.
* A downstream keepalive connection is always connected to the existence
@@ -436,7 +438,7 @@
/* 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);
if (status != OK)
goto cleanup;
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=232247&r1=232246&r2=232247&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Fri Aug 12 02:38:09 2005
@@ -1002,7 +1002,7 @@
}
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;
int i, l1, l2;
@@ -1031,7 +1031,7 @@
* and stick to plain strings for the config values.
*/
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;
size_t len = strlen(str);