Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 28270 invoked from network); 2 Oct 2008 09:02:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Oct 2008 09:02:29 -0000 Received: (qmail 48151 invoked by uid 500); 2 Oct 2008 09:02:24 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 47880 invoked by uid 500); 2 Oct 2008 09:02:23 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 47869 invoked by uid 99); 2 Oct 2008 09:02:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Oct 2008 02:02:23 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Oct 2008 09:01:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 36BBF238896D; Thu, 2 Oct 2008 02:01:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r701044 - in /tomcat/connectors/trunk/jk/native/iis: Makefile.x86 jk_isapi_plugin.c Date: Thu, 02 Oct 2008 09:01:33 -0000 To: dev@tomcat.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081002090134.36BBF238896D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mturk Date: Thu Oct 2 02:01:32 2008 New Revision: 701044 URL: http://svn.apache.org/viewvc?rev=701044&view=rev Log: Allow error_page redirect to include error code format. Eg. /foo/error%d.htm will be handled as /foo/error404.html for returned 404 status from Tomcat Modified: tomcat/connectors/trunk/jk/native/iis/Makefile.x86 tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Modified: tomcat/connectors/trunk/jk/native/iis/Makefile.x86 URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/Makefile.x86?rev=701044&r1=701043&r2=701044&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/iis/Makefile.x86 (original) +++ tomcat/connectors/trunk/jk/native/iis/Makefile.x86 Thu Oct 2 02:01:32 2008 @@ -111,7 +111,7 @@ $(LINK32_FLAGS) $(LINK32_OBJS) << -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" $(CFLAGS) /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c .c{$(INTDIR)}.obj:: $(CPP) @<< 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=701044&r1=701043&r2=701044&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original) +++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Thu Oct 2 02:01:32 2008 @@ -1878,16 +1878,21 @@ } /** Try to redirect the client to a page explaining the ISAPI redirector is down */ if (error_page) { - int len_of_error_page = (int)strlen(error_page); + char error_page_url[INTERNET_MAX_URL_LENGTH] = ""; + int len_of_error_page; + StringCbPrintf(error_page_url, INTERNET_MAX_URL_LENGTH, + error_page, is_error); + len_of_error_page = (int)strlen(error_page_url); if (!lpEcb->ServerSupportFunction(lpEcb->ConnID, HSE_REQ_SEND_URL_REDIRECT_RESP, - error_page, + error_page_url, (LPDWORD)&len_of_error_page, (LPDWORD)NULL)) { jk_log(logger, JK_LOG_ERROR, - "HttpExtensionProc error, Error page redirect failed with %d (0x%08x)", - GetLastError(), GetLastError()); + "HttpExtensionProc error, Error page '%s' redirect failed with %d (0x%08x)", + error_page_url, GetLastError(), GetLastError()); lpEcb->dwHttpStatusCode = is_error; + write_error_message(lpEcb, is_error); } } else { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org