From: Sam Ruby <rubys@php.net>
Date: Mon, 24 Jul 2000 05:29:20 +0000 (+0000)
Subject: Correct the value of request_uri
X-Git-Tag: PRE_FILE_COMPILE_API_CHANGE~173
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54790b5e63d5124bc37652854593716ddcef9062;p=php

Correct the value of request_uri
---

diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index b3a8e0f02f..3f5c7d19ff 100644
--- 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 c085488309..6b10c268bc 100644
--- 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);