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 2006/12/07 14:45:22 UTC
svn commit: r483456 - in /tomcat/connectors/trunk/jk/native/common:
jk_ajp_common.c jk_service.h
Author: mturk
Date: Thu Dec 7 05:45:22 2006
New Revision: 483456
URL: http://svn.apache.org/viewvc?view=rev&rev=483456
Log:
Rename structure parameter name. No functional change.
The http_status is some sort of #define in SunOne
web server, so the compilation breaks. Renaming the param solves the issue.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/native/common/jk_service.h
Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?view=diff&rev=483456&r1=483455&r2=483456
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Thu Dec 7 05:45:22 2006
@@ -1398,7 +1398,7 @@
res.num_headers);
if (r->flush && r->flush_header)
r->flush(r);
- r->http_status = res.status;
+ r->http_response_status = res.status;
}
return JK_AJP13_SEND_HEADERS;
@@ -1627,7 +1627,7 @@
}
else if (JK_AJP13_SEND_HEADERS == rc) {
if (p->worker->http_status_fail &&
- (p->worker->http_status_fail == s->http_status)) {
+ (p->worker->http_status_fail == s->http_response_status)) {
JK_TRACE_EXIT(l);
return JK_STATUS_ERROR;
}
Modified: tomcat/connectors/trunk/jk/native/common/jk_service.h
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_service.h?view=diff&rev=483456&r1=483455&r2=483456
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_service.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_service.h Thu Dec 7 05:45:22 2006
@@ -225,7 +225,7 @@
/*
* HTTP status sent from container.
*/
- int http_status;
+ int http_response_status;
/* Uri worker map. Added for virtual host support
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org