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

sebastian Sun Oct 28 18:49:02 2001 EDT Modified files: /php4/sapi/servlet formatter.java servlet.java Log: Whitespace changes.

Index: php4/sapi/servlet/formatter.java diff -u php4/sapi/servlet/formatter.java:1.3 php4/sapi/servlet/formatter.java:1.4 --- php4/sapi/servlet/formatter.java:1.3 Mon Feb 26 01:07:37 2001 +++ php4/sapi/servlet/formatter.java Sun Oct 28 18:49:02 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: formatter.java,v 1.3 2001/02/26 06:07:37 andi Exp $ */ +/* $Id: formatter.java,v 1.4 2001/10/28 23:49:02 sebastian Exp $ */ package net.php; @@ -24,13 +24,8 @@ import javax.servlet.http.*; public class formatter extends servlet { - - public void service(HttpServletRequest request, - HttpServletResponse response) - throws ServletException - { - display_source_mode = true; - super.service(request, response); - } - + public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException { + display_source_mode = true; + super.service(request, response); + } } Index: php4/sapi/servlet/servlet.java diff -u php4/sapi/servlet/servlet.java:1.15 php4/sapi/servlet/servlet.java:1.16 --- php4/sapi/servlet/servlet.java:1.15 Mon Feb 26 01:07:37 2001 +++ php4/sapi/servlet/servlet.java Sun Oct 28 18:49:02 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: servlet.java,v 1.15 2001/02/26 06:07:37 andi Exp $ */ +/* $Id: servlet.java,v 1.16 2001/10/28 23:49:02 sebastian Exp $ */ package net.php; @@ -29,160 +29,184 @@ import java.lang.reflect.Method; public class servlet extends HttpServlet { + char slash = System.getProperty("file.separator").charAt(0); - char slash=System.getProperty("file.separator").charAt(0); - HttpServletRequest request; - HttpServletResponse response; - ServletInputStream stream; - - static int startup_count = 0; - - protected boolean display_source_mode = false; - private Method addHeader; - - /******************************************************************/ - /* native methods */ - /******************************************************************/ - - public native void startup(); - public native long define(String name); - public native void send(String requestMethod, String queryString, - String pathInfo, String pathTranslated, - String contentType, int contentLength, String authUser, - boolean display_source_mode); - public native void shutdown(); - - /******************************************************************/ - /* sapi callbacks */ - /******************************************************************/ - - public String readPost(int bytes) { - String result; - if (!request.getMethod().equals("POST")) { - result = request.getQueryString(); - } else { - Enumeration e = request.getParameterNames(); - result=""; - String concat=""; - while (e.hasMoreElements()) { - String name = (String)e.nextElement(); - String value = request.getParameter(name); - result+=concat+name+"="+URLEncoder.encode(value); - concat="&"; - } + HttpServletRequest request; + HttpServletResponse response; + ServletInputStream stream; + + static int startup_count = 0; + + protected boolean display_source_mode = false; + private Method addHeader; + + // Native methods + + public native void startup(); + public native long define(String name); + public native void send(String requestMethod, + String queryString, + String pathInfo, + String pathTranslated, + String contentType, + int contentLength, + String authUser, + boolean display_source_mode + ); + public native void shutdown(); + + // SAPI Callbacks + + public String readPost(int bytes) { + String result; + + if (!request.getMethod().equals("POST")) { + result = request.getQueryString(); + } else { + Enumeration e = request.getParameterNames(); + String concat = ""; + result = ""; + + while (e.hasMoreElements()) { + String name = (String)e.nextElement(); + String value = request.getParameter(name); + + result += concat + name + "=" + URLEncoder.encode(value); + concat = "&"; } - if (result == null) return ""; - return result; } - public String readCookies() { - reflect.setResult(define("request"), request); - reflect.setResult(define("response"), response); - reflect.setResult(define("PHP_SELF"), request.getRequestURI()); - return request.getHeader("cookie"); - } - - public void header(String data) { - - // try to send the header using the most specific servlet API - // as possible (some servlet engines will add a content type - // header unless the setContentType method is called). - try { - if (data.startsWith("Content-type: ")) { - response.setContentType(data.substring(data.indexOf(" ")+1)); - } else if (data.startsWith("Location: ")) { - response.sendRedirect(data.substring(data.indexOf(" ")+1)); - } else { - int colon = data.indexOf(": "); - if (colon > 0) { - try { - addHeader.invoke(response, new Object[] - { data.substring(0,colon), data.substring(colon+2) } ); - } catch (Exception e) { - e.printStackTrace(System.err); - } - } else { - write(data); + if (result == null) return ""; + + return result; + } + + public String readCookies() { + reflect.setResult(define("request"), request); + reflect.setResult(define("response"), response); + reflect.setResult(define("PHP_SELF"), request.getRequestURI()); + + return request.getHeader("cookie"); + } + + public void header(String data) { + // try to send the header using the most specific servlet API + // as possible (some servlet engines will add a content type + // header unless the setContentType method is called). + try { + if (data.startsWith("Content-type: ")) { + response.setContentType(data.substring(data.indexOf(" ") + 1)); + } + + else if (data.startsWith("Location: ")) { + response.sendRedirect(data.substring(data.indexOf(" ") + 1)); + } + + else { + int colon = data.indexOf(": "); + + if (colon > 0) { + try { + addHeader.invoke(response, new Object[] + { data.substring(0,colon), data.substring(colon + 2) } ); + } + + catch (Exception e) { + e.printStackTrace(System.err); } } - } catch (IOException e) { - e.printStackTrace(System.err); + + else { + write(data); + } } + } + catch (IOException e) { + e.printStackTrace(System.err); } + } - public void write(String data) { - try { - response.getWriter().print(data); - } catch (IOException e) { - e.printStackTrace(System.err); - } + public void write(String data) { + try { + response.getWriter().print(data); } - /******************************************************************/ - /* servlet interface */ - /******************************************************************/ - - public void init(ServletConfig config) throws ServletException { - super.init(config); - - // first time in, initialize native code - if (0 == startup_count++) { - reflect.loadLibrary("servlet"); - startup(); - } + catch (IOException e) { + e.printStackTrace(System.err); + } + } - // try to find the addHeader method (added in the servlet API 2.2) - // otherwise settle for the setHeader method - try { - Class c = Class.forName("javax.servlet.http.HttpServletResponse"); - Method method[] = c.getDeclaredMethods(); - for (int i=0; i<method.length; i++) { - if (method[i].getName().equals("addHeader")) { - addHeader = method[i]; - break; - } - if (method[i].getName().equals("setHeader")) { - addHeader = method[i]; - } + // Servlet interface + + public void init(ServletConfig config) + throws ServletException { + super.init(config); + + // first time in, initialize native code + if (0 == startup_count++) { + reflect.loadLibrary("servlet"); + startup(); + } + + // try to find the addHeader method (added in the servlet API 2.2) + // otherwise settle for the setHeader method + + try { + Class c = Class.forName("javax.servlet.http.HttpServletResponse"); + Method method[] = c.getDeclaredMethods(); + + for (int i = 0; i < method.length; i++) { + if (method[i].getName().equals("addHeader")) { + addHeader = method[i]; + break; + } + + if (method[i].getName().equals("setHeader")) { + addHeader = method[i]; } - } catch (Exception e) { - e.printStackTrace(System.err); } } - public void service(HttpServletRequest request, - HttpServletResponse response, - String contextPath) - throws ServletException - { - this.request=request; - this.response=response; - - send(request.getMethod(), request.getQueryString(), - request.getRequestURI(), contextPath, - request.getContentType(), request.getContentLength(), - request.getRemoteUser(), display_source_mode); - - try { - if (stream != null) stream.close(); - } catch (IOException e) { - throw new ServletException(e.toString()); - } - } - - public void service(HttpServletRequest request, - HttpServletResponse response) - throws ServletException - { - String servletPath=request.getServletPath(); - String contextPath=getServletContext().getRealPath(servletPath); - service(request, response, contextPath); - } - - public void destroy() { - if (0 == --startup_count) shutdown(); - super.destroy(); + catch (Exception e) { + e.printStackTrace(System.err); } + } + public void service(HttpServletRequest request, HttpServletResponse response, String contextPath) + throws ServletException { + this.request = request; + this.response = response; + + send(request.getMethod(), + request.getQueryString(), + request.getRequestURI(), + contextPath, + request.getContentType(), + request.getContentLength(), + request.getRemoteUser(), + display_source_mode + ); + + try { + if (stream != null) stream.close(); + } + + catch (IOException e) { + throw new ServletException(e.toString()); + } + } + + public void service(HttpServletRequest request, HttpServletResponse response) + throws ServletException { + String servletPath = request.getServletPath(); + String contextPath = getServletContext().getRealPath(servletPath); + + service(request, response, contextPath); + } + + public void destroy() { + if (0 == --startup_count) shutdown(); + super.destroy(); + } }