You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2004/08/01 16:06:24 UTC
cvs commit: jakarta-tomcat-connectors/ajp/proxy proxy_ajp.c
mturk 2004/08/01 07:06:24
Modified: ajp/proxy proxy_ajp.c
Log:
Added include "ajp.h", and made some casting
Revision Changes Path
1.4 +7 -5 jakarta-tomcat-connectors/ajp/proxy/proxy_ajp.c
Index: proxy_ajp.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/proxy_ajp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- proxy_ajp.c 30 Jul 2004 17:12:08 -0000 1.3
+++ proxy_ajp.c 1 Aug 2004 14:06:24 -0000 1.4
@@ -16,6 +16,7 @@
/* HTTP routines for Apache proxy */
#include "mod_proxy.h"
+#include "ajp.h"
module AP_MODULE_DECLARE_DATA proxy_ajp_module;
@@ -379,10 +380,9 @@
}
if (1) { /* XXXX only when something to send ? */
- void *msg;
+ ajp_msg_t *msg;
apr_size_t bufsiz;
char *buff;
- long len;
status = ajp_alloc_data_msg(r, &buff, &bufsiz, &msg);
if (status != APR_SUCCESS) {
return status;
@@ -412,7 +412,8 @@
}
/* read the response */
- status = ajp_read_header(p_conn->sock, r, &(p_conn->data));
+ status = ajp_read_header(p_conn->sock, r,
+ (ajp_msg_t **)&(p_conn->data));
if (status != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,
"proxy: request failed to %pI (%s)",
@@ -472,7 +473,7 @@
}
} else if (type == 3) {
/* AJP13_SEND_BODY_CHUNK: piece of data */
- apr_size_t size;
+ apr_uint16_t size;
char *buff;
status = ajp_parse_data(r, p_conn->data, &size, &buff);
@@ -483,7 +484,8 @@
break;
}
/* Read the next message */
- status = ajp_read_header(p_conn->sock, r, &(p_conn->data));
+ status = ajp_read_header(p_conn->sock, r,
+ (ajp_msg_t **)&(p_conn->data));
if (status != APR_SUCCESS) {
break;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org