Correct the value of request_uri

diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index b3a8e0f02fc0bf715468e4b1dfb08cea0a9870cf..3f5c7d19ffc7bc050334c1e05da56e530d19fc28 100644 (file)
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -320,7 +320,7 @@ JNIEXPORT jlong JNICALL Java_net_php_servlet_define
 JNIEXPORT void JNICALL Java_net_php_servlet_send
        (JNIEnv *jenv, jobject self, 
         jstring requestMethod, jstring queryString,
-        jstring pathInfo, jstring pathTranslated,
+        jstring requestURI, jstring pathTranslated,
         jstring contentType, jint contentLength, 
         jstring authUser, jboolean display_source_mode)
 {
@@ -354,7 +354,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send
        SETSTRING( SG(request_info).auth_user, authUser );
        SETSTRING( SG(request_info).request_method, requestMethod );
        SETSTRING( SG(request_info).query_string, queryString );
-       SETSTRING( SG(request_info).request_uri, pathInfo );
+       SETSTRING( SG(request_info).request_uri, requestURI );
        SETSTRING( SG(request_info).content_type, contentType );
        SG(request_info).content_length = contentLength;
        SG(request_info).auth_password = NULL;

diff --git a/sapi/servlet/servlet.java b/sapi/servlet/servlet.java
index c085488309bbde25c444378ca456aec8adcd3967..6b10c268bc852f6810e2a05a1ac520fa7d988a24 100644 (file)
--- a/sapi/servlet/servlet.java
+++ b/sapi/servlet/servlet.java
@@ -160,7 +160,7 @@ public class servlet extends HttpServlet {
        String contextPath=getServletContext().getRealPath(servletPath);
 
        send(request.getMethod(), request.getQueryString(),
-            request.getPathInfo(), contextPath,
+            request.getRequestURI(), contextPath,
             request.getContentType(), request.getContentLength(),
            request.getRemoteUser(), display_source_mode);