httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1228269 - in /httpd/httpd/branches/2.2.x/modules/proxy: ajp_msg.c mod_proxy.h proxy_util.c
Date Fri, 06 Jan 2012 16:58:14 GMT
Author: wrowe
Date: Fri Jan  6 16:58:13 2012
New Revision: 1228269

URL: http://svn.apache.org/viewvc?rev=1228269&view=rev
Log:
Revert r1227860; proposing for backport

Modified:
    httpd/httpd/branches/2.2.x/modules/proxy/ajp_msg.c
    httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.h
    httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c

Modified: httpd/httpd/branches/2.2.x/modules/proxy/ajp_msg.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/ajp_msg.c?rev=1228269&r1=1228268&r2=1228269&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/ajp_msg.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/ajp_msg.c Fri Jan  6 16:58:13 2012
@@ -274,7 +274,7 @@ apr_status_t ajp_msg_append_uint8(ajp_ms
 apr_status_t ajp_msg_append_string_ex(ajp_msg_t *msg, const char *value,
                                       int convert)
 {
-    apr_size_t len;
+    size_t len;
 
     if (value == NULL) {
         return(ajp_msg_append_uint16(msg, 0xFFFF));

Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.h?rev=1228269&r1=1228268&r2=1228269&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.h Fri Jan  6 16:58:13 2012
@@ -493,7 +493,7 @@ PROXY_DECLARE(int) ap_proxy_is_hostname(
 PROXY_DECLARE(int) ap_proxy_is_word(struct dirconn_entry *This, apr_pool_t *p);
 PROXY_DECLARE(int) ap_proxy_checkproxyblock(request_rec *r, proxy_server_conf *conf, apr_sockaddr_t
*uri_addr);
 PROXY_DECLARE(int) ap_proxy_pre_http_request(conn_rec *c, request_rec *r);
-PROXY_DECLARE(apr_status_t) ap_proxy_string_read(conn_rec *c, apr_bucket_brigade *bb, char
*buff, apr_size_t bufflen, int *eos);
+PROXY_DECLARE(apr_status_t) ap_proxy_string_read(conn_rec *c, apr_bucket_brigade *bb, char
*buff, size_t bufflen, int *eos);
 PROXY_DECLARE(void) ap_proxy_table_unmerge(apr_pool_t *p, apr_table_t *t, char *key);
 /* DEPRECATED (will be replaced with ap_proxy_connect_backend */
 PROXY_DECLARE(int) ap_proxy_connect_to_backend(apr_socket_t **, const char *, apr_sockaddr_t
*, const char *, proxy_server_conf *, server_rec *, apr_pool_t *);

Modified: httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c?rev=1228269&r1=1228268&r2=1228269&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c Fri Jan  6 16:58:13 2012
@@ -1149,14 +1149,14 @@ PROXY_DECLARE(const char *) ap_proxy_coo
     proxy_req_conf *rconf = ap_get_module_config(r->request_config,
                                                  &proxy_module);
     struct proxy_alias *ent;
-    apr_size_t len = strlen(str);
+    size_t len = strlen(str);
     const char *newpath = NULL;
     const char *newdomain = NULL;
     const char *pathp;
     const char *domainp;
     const char *pathe = NULL;
     const char *domaine = NULL;
-    apr_size_t l1, l2, poffs = 0, doffs = 0;
+    size_t l1, l2, poffs = 0, doffs = 0;
     int i;
     int ddiff = 0;
     int pdiff = 0;



Mime
View raw message