mturk 2002/09/23 11:30:40
Modified: jk/native2/server/isapi jk_isapi_plugin.c
Log:
Use the GetServerVariable for the SERVER_NAME and
SERVER_PORT variables.
Revision Changes Path
1.45 +19 -14
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- jk_isapi_plugin.c 23 Sep 2002 17:42:38 -0000 1.44
+++ jk_isapi_plugin.c 23 Sep 2002 18:30:40 -0000 1.45
@@ -258,6 +258,7 @@
char snuri[INTERNET_MAX_URL_LENGTH]="/";
char Host[INTERNET_MAX_URL_LENGTH];
char Translate[INTERNET_MAX_URL_LENGTH];
+ char Port[INTERNET_MAX_URL_LENGTH];
BOOL (WINAPI * GetHeader)
(struct _HTTP_FILTER_CONTEXT * pfc, LPSTR lpszName, LPVOID
lpvBuffer, LPDWORD lpdwSize );
BOOL (WINAPI * SetHeader)
@@ -268,7 +269,7 @@
DWORD sz = sizeof(uri);
DWORD szHost = sizeof(Host);
DWORD szTranslate = sizeof(Translate);
-
+ DWORD szPort = sizeof(Port);
#ifdef SF_NOTIFY_AUTH_COMPLETE
if (auth_notification_flags == SF_NOTIFY_AUTH_COMPLETE) {
GetHeader=((PHTTP_FILTER_AUTH_COMPLETE_INFO)pvNotification)->GetHeader;
@@ -329,20 +330,24 @@
}
jk_requtil_getParents(uri);
-
- if(GetHeader(pfc, "Host:", (LPVOID)Host, (LPDWORD)&szHost)) {
- env->l->jkLog(env, env->l, JK_LOG_DEBUG,
- "In HttpFilterProc Virtual Host redirection of %s\n",
- Host);
- uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,Host,
0, uri );
+ if (pfc->GetServerVariable(pfc, SERVER_NAME, (LPVOID)Host,
(LPDWORD)&szHost)){
+ if (szHost > 0) {
+ Host[szHost-1] = '\0';
+ }
}
-
- if (uriEnv==NULL) {
- env->l->jkLog(env, env->l, JK_LOG_DEBUG,
- "In HttpFilterProc test Default redirection of %s\n",
- uri);
- uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,NULL,
0, uri );
+ Port[0] = '\0';
+ if (pfc->GetServerVariable(pfc, "SERVER_PORT", (LPVOID)Port,
(LPDWORD)&szPort)){
+ if (szPort > 0) {
+ Port[szPort-1] = '\0';
+ }
}
+ szPort = atoi(Port);
+ if (szPort == 80)
+ szPort = 0;
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ "In HttpFilterProc Virtual Host redirection of %s :
%d\n",
+ Host, Port);
+ uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,Host, 0,
uri );
if( uriEnv!=NULL ) {
char *forwardURI;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
