You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2007/09/25 15:55:26 UTC
svn commit: r579249 - in /tomcat/connectors/trunk/jk/native:
iis/jk_isapi_plugin.c netscape/jk_nsapi_plugin.c
Author: rjung
Date: Tue Sep 25 06:55:25 2007
New Revision: 579249
URL: http://svn.apache.org/viewvc?rev=579249&view=rev
Log:
Rename member of service private data from
request_started to response_started for IIS and Netscape.
This name is used with Apache for the same purpose as
request_started in IIS/Netscape and it seems to be a better fit.
Modified:
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=579249&r1=579248&r2=579249&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Tue Sep 25 06:55:25 2007
@@ -212,7 +212,7 @@
{
jk_pool_t p;
- int request_started;
+ int response_started;
unsigned int bytes_read_so_far;
LPEXTENSION_CONTROL_BLOCK lpEcb;
};
@@ -587,12 +587,12 @@
if (s && s->ws_private) {
int rv = JK_TRUE;
isapi_private_data_t *p = s->ws_private;
- if (!p->request_started) {
+ if (!p->response_started) {
char *status_str;
DWORD status_str_len;
char *headers_str = NULL;
BOOL keep_alive = FALSE;
- p->request_started = JK_TRUE;
+ p->response_started = JK_TRUE;
/*
* Create the status line
@@ -743,7 +743,7 @@
unsigned int written = 0;
char *buf = (char *)b;
- if (!p->request_started) {
+ if (!p->response_started) {
start_response(s, 200, NULL, NULL, NULL, 0);
}
@@ -1499,7 +1499,7 @@
jk_init_ws_service(&s);
jk_open_pool(&private_data.p, buf, sizeof(buf));
- private_data.request_started = JK_FALSE;
+ private_data.response_started = JK_FALSE;
private_data.bytes_read_so_far = 0;
private_data.lpEcb = lpEcb;
Modified: tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c?rev=579249&r1=579248&r2=579249&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c Tue Sep 25 06:55:25 2007
@@ -43,7 +43,7 @@
{
jk_pool_t p;
- int request_started;
+ int response_started;
pblock *pb;
Session *sn;
@@ -125,10 +125,10 @@
{
if (s && s->ws_private) {
nsapi_private_data_t *p = s->ws_private;
- if (!p->request_started) {
+ if (!p->response_started) {
unsigned i;
- p->request_started = JK_TRUE;
+ p->response_started = JK_TRUE;
/* Remove "old" content type */
param_free(pblock_remove("content-type", p->rq->srvhdrs));
@@ -210,7 +210,7 @@
nsapi_private_data_t *p = s->ws_private;
if (l) {
- if (!p->request_started) {
+ if (!p->response_started) {
start_response(s, 200, NULL, NULL, NULL, 0);
}
@@ -366,7 +366,7 @@
jk_open_pool(&private_data.p, buf, sizeof(buf));
- private_data.request_started = JK_FALSE;
+ private_data.response_started = JK_FALSE;
private_data.pb = pb;
private_data.sn = sn;
private_data.rq = rq;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org