nacho 02/04/19 07:03:28
Modified: jk/native2/server/isapi jk_iis.h jk_service_iis.c
Log:
* Work in progress
More cleanup, compiles again :)
Revision Changes Path
1.3 +14 -17 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h
Index: jk_iis.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_iis.h 19 Apr 2002 03:14:22 -0000 1.2
+++ jk_iis.h 19 Apr 2002 14:03:28 -0000 1.3
@@ -73,7 +73,7 @@
#endif /* __cplusplus */
-#define VERSION_STRING "Jakarta/ISAPI/1.2Dev"
+#define VERSION_STRING "Jakarta/ISAPI/2.0Dev"
#define DEFAULT_WORKER_NAME ("ajp13")
/*
@@ -95,7 +95,11 @@
#define HTTP_QUERY_HEADER_NAME ("HTTP_TOMCATQUERY")
#define HTTP_WORKER_HEADER_NAME ("HTTP_TOMCATWORKER")
-#define REGISTRY_LOCATION ("Software\\Apache Software Foundation\\Jakarta
Isapi Redirector\\1.2")
+#define SERVER_NAME ("SERVER_NAME" )
+
+#define SERVER_SOFTWARE ("SERVER_SOFTWARE")
+
+#define REGISTRY_LOCATION ("Software\\Apache Software Foundation\\Jakarta
Isapi Redirector\\2.0")
#define EXTENSION_URI_TAG ("extension_uri")
#define URI_SELECT_TAG ("uri_select")
@@ -112,18 +116,20 @@
#define GET_SERVER_VARIABLE_VALUE(name, place) { \
(place) = NULL; \
huge_buf_sz = sizeof(huge_buf); \
- if (get_server_value(private_data->lpEcb, \
+ if (get_server_value(env, \
+ lpEcb, \
(name), \
huge_buf, \
huge_buf_sz, \
"")) { \
- (place) = private_data->p.pstrdup(env,&private_data->p,huge_buf); \
+ (place) = w->pool->pstrdup(env,w->pool,huge_buf); \
} \
}\
#define GET_SERVER_VARIABLE_VALUE_INT(name, place, def) { \
huge_buf_sz = sizeof(huge_buf); \
- if (get_server_value(private_data->lpEcb, \
+ if (get_server_value(env,\
+ lpEcb, \
(name), \
huge_buf, \
huge_buf_sz, \
@@ -137,20 +143,11 @@
} \
}\
+void JK_METHOD getparents(char *name);
-static int JK_METHOD jk2_service_iis_head(jk_env_t *env, jk_ws_service_t *s );
-
-static int JK_METHOD jk2_service_iis_read(jk_env_t *env, jk_ws_service_t *s,
- void *b, unsigned len,
- unsigned *actually_read);
-
-static int JK_METHOD jk2_service_iis_write(jk_env_t *env,jk_ws_service_t *s,
- const void *b,
- unsigned l);
-
-static int JK_METHOD jk2_service_iis_init_ws_service( struct jk_env *env,
jk_ws_service_t *_this,
- struct jk_worker *w, void *serverObj );
+int JK_METHOD escape_url(const char *path, char *dest, int destsize);
+int JK_METHOD unescape_url(char *url);
#ifdef __cplusplus
}
1.5 +15 -37
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_service_iis.c 19 Apr 2002 02:34:38 -0000 1.4
+++ jk_service_iis.c 19 Apr 2002 14:03:28 -0000 1.5
@@ -80,12 +80,6 @@
#include "jk_iis.h"
-static char *SERVER_NAME = "SERVER_NAME";
-static char *SERVER_SOFTWARE = "SERVER_SOFTWARE";
-
-
-
-
static int JK_METHOD jk2_service_iis_head(jk_env_t *env, jk_ws_service_t *s ){
static char crlf[3] = { (char)13, (char)10, '\0' };
char *reason;
@@ -262,7 +256,7 @@
return JK_FALSE;
}
-static int get_server_value(LPEXTENSION_CONTROL_BLOCK lpEcb,
+static int get_server_value(struct jk_env *env, LPEXTENSION_CONTROL_BLOCK lpEcb,
char *name,
char *buf,
DWORD bufsz,
@@ -286,36 +280,19 @@
}
-int JK_METHOD jk2_service_iis_init(jk_env_t *env, jk_ws_service_t *s)
-{
- if(s==NULL ) {
- return JK_FALSE;
- }
-
- s->head = jk2_service_iis_head;
- s->read = jk2_service_iis_read;
- s->write = jk2_service_iis_write;
- s->init = jk2_service_iis_init_ws_service;
-
- return JK_TRUE;
-}
-
-static int JK_METHOD jk2_service_iis_init_ws_service( struct jk_env *env,
jk_ws_service_t *s,
+static int JK_METHOD jk2_service_iis_initService( struct jk_env *env,
jk_ws_service_t *s,
struct jk_worker *w, void *serverObj )
/* */
{
LPEXTENSION_CONTROL_BLOCK lpEcb=(LPEXTENSION_CONTROL_BLOCK)serverObj;
- char **worker_name;
-
+ char *worker_name;
+ char huge_buf[16 * 1024]; /* should be enough for all */
+
DWORD huge_buf_sz;
s->jvm_route = NULL;
- s->head = jk_service_iis_head;
- s->read = read;
- s->write = write;
-
- GET_SERVER_VARIABLE_VALUE(HTTP_WORKER_HEADER_NAME, ( worker->name ));
+ GET_SERVER_VARIABLE_VALUE(HTTP_WORKER_HEADER_NAME, ( worker_name ));
GET_SERVER_VARIABLE_VALUE(HTTP_URI_HEADER_NAME, s->req_uri);
GET_SERVER_VARIABLE_VALUE(HTTP_QUERY_HEADER_NAME, s->query_string);
@@ -394,7 +371,7 @@
for(i = 0 ; i < 9 ; i++) {
if (ssl_env_values[i]) {
s->attributes->put( env, s->attributes,
- ssl_env_names[i], ssl_env_values[i]);
+ ssl_env_names[i], ssl_env_values[i],NULL);
j++;
}
}
@@ -425,7 +402,8 @@
huge_buf_sz = sizeof(huge_buf);
- if (get_server_value(lpEcb,
+ if (get_server_value(env,
+ lpEcb,
"ALL_HTTP",
huge_buf,
huge_buf_sz,
@@ -486,7 +464,7 @@
}
if (real_header) {
- s->headers_in->put( env, s->headers_in, headerName, tmp );
+ s->headers_in->put( env, s->headers_in, headerName, tmp, NULL );
}
while(*tmp != '\n' && *tmp != '\r') {
@@ -510,7 +488,7 @@
*/
if(need_content_length_header) {
s->headers_in->put( env, s->headers_in,
- "content-length", "0");
+ "content-length", "0",NULL);
cnt++;
}
} else {
@@ -524,15 +502,15 @@
return JK_TRUE;
}
-static void jk2_service_iis_afterRequest(jk_env_t *env, jk_ws_service_t *s )
+static void JK_METHOD jk2_service_iis_afterRequest(jk_env_t *env, jk_ws_service_t
*s )
{
if (s->content_read < s->content_length ||
(s->is_chunked && ! s->no_more_chunks)) {
-
- request_rec *r=s->ws_private;
- char *buff = apr_palloc(r->pool, 2048);
+ LPEXTENSION_CONTROL_BLOCK
lpEcb=(LPEXTENSION_CONTROL_BLOCK)s->ws_private;
+
+ char *buff = s->pool->calloc(env,s->pool, 2048);
if (buff != NULL) {
int rd;
/* Is there a IIS equivalent ? */
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
