cvs: php4 /sapi/servlet servlet.c servlet.java

rubys Sun Jul 23 22:29:19 2000 EDT Modified files: /php4/sapi/servlet servlet.c servlet.java Log: Correct the value of request_uri Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.33 php4/sapi/servlet/servlet.c:1.34 --- php4/sapi/servlet/servlet.c:1.33 Mon Jun 26 11:05:55 2000 +++ php4/sapi/servlet/servlet.c Sun Jul 23 22:29:19 2000 @@ -320,7 +320,7 @@ 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 @@ 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; Index: php4/sapi/servlet/servlet.java diff -u php4/sapi/servlet/servlet.java:1.11 php4/sapi/servlet/servlet.java:1.12 --- php4/sapi/servlet/servlet.java:1.11 Tue Jun 27 03:37:36 2000 +++ php4/sapi/servlet/servlet.java Sun Jul 23 22:29:19 2000 @@ -160,7 +160,7 @@ 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);