svn commit: r1647853 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

[rjung]

Author: rjung
Date: Wed Dec 24 22:27:36 2014
New Revision: 1647853

URL: http://svn.apache.org/r1647853
Log:
Replace remnant from prototype testing on Unix
by better Windows equivalent.

Thanks Konstantin for review.

Modified:
    tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1647853&r1=1647852&r2=1647853&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Wed Dec 24 22:27:36 2014
@@ -3857,7 +3857,8 @@ static char *path_merge(const char *root
                 skip--;
             }
             if (remain > 0) {
-                return "";
+                SetLastError(ERROR_BAD_PATHNAME);
+                return 0;
             }
             if (skip < start) {
                 skip = start;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org