xml-rpc-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject cvs commit: xml-rpc/src/java/org/apache/xmlrpc WebServer.java
Date Wed, 14 Aug 2002 19:27:58 GMT
dlr         2002/08/14 12:27:58

  Modified:    src/java/org/apache/xmlrpc WebServer.java
  Log:
  Adam Megacz <adam@megacz.com> pointed out that RFC 2068 demands an
  encoding of US-ASCII for most standard HTTP request/response content.
  Adjusted accordingly.
  
  Revision  Changes    Path
  1.14      +43 -18    xml-rpc/src/java/org/apache/xmlrpc/WebServer.java
  
  Index: WebServer.java
  ===================================================================
  RCS file: /home/cvs/xml-rpc/src/java/org/apache/xmlrpc/WebServer.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -u -r1.13 -r1.14
  --- WebServer.java	13 Aug 2002 22:27:16 -0000	1.13
  +++ WebServer.java	14 Aug 2002 19:27:58 -0000	1.14
  @@ -59,6 +59,7 @@
   import java.io.BufferedOutputStream;
   import java.io.IOException;
   import java.io.InterruptedIOException;
  +import java.io.UnsupportedEncodingException;
   import java.net.InetAddress;
   import java.net.ServerSocket;
   import java.net.Socket;
  @@ -86,14 +87,19 @@
       protected Stack threadpool;
       protected ThreadGroup runners;
   
  -    protected static final byte[] ctype = "Content-Type: text/xml\r\n".getBytes();
  -    protected static final byte[] clength = "Content-Length: ".getBytes();
  -    protected static final byte[] newline = "\r\n".getBytes();
  -    protected static final byte[] doubleNewline = "\r\n\r\n".getBytes();
  -    protected static final byte[] conkeep = "Connection: Keep-Alive\r\n".getBytes();
  -    protected static final byte[] conclose = "Connection: close\r\n".getBytes();
  -    protected static final byte[] ok = " 200 OK\r\n".getBytes();
  -    protected static final byte[] server = "Server: Apache XML-RPC 1.0\r\n".getBytes();
  +    protected static final byte[] ctype =
  +        toHTTPBytes("Content-Type: text/xml\r\n");
  +    protected static final byte[] clength =
  +        toHTTPBytes("Content-Length: ");
  +    protected static final byte[] newline = toHTTPBytes("\r\n");
  +    protected static final byte[] doubleNewline = toHTTPBytes("\r\n\r\n");
  +    protected static final byte[] conkeep =
  +        toHTTPBytes("Connection: Keep-Alive\r\n");
  +    protected static final byte[] conclose =
  +        toHTTPBytes("Connection: close\r\n");
  +    protected static final byte[] ok = toHTTPBytes(" 200 OK\r\n");
  +    protected static final byte[] server =
  +        toHTTPBytes("Server: Apache XML-RPC 1.0\r\n");
   
       private static final String HTTP_11 = "HTTP/1.1";
       private static final String STAR = "*";
  @@ -180,6 +186,23 @@
       }
   
       /**
  +     * Returns the US-ASCII encoded byte representation of text for
  +     * HTTP use (as per section 2.2 of RFC 2068).
  +     */
  +    protected static final byte[] toHTTPBytes(String text)
  +    {
  +        try
  +        {
  +            return text.getBytes("US-ASCII");
  +        }
  +        catch (UnsupportedEncodingException e)
  +        {
  +            throw new Error(e.getMessage() +
  +                            ": HTTP requires US-ASCII encoding");
  +        }
  +    }
  +
  +    /**
        * Factory method to manufacture the server socket.  Useful as a
        * hook method for subclasses to override when they desire
        * different flavor of socket (i.e. a <code>SSLServerSocket</code>).
  @@ -585,7 +608,7 @@
                           ServerInputStream sin = new ServerInputStream(input,
                                   contentLength);
                           byte result[] = xmlrpc.execute(sin, user, password);
  -                        output.write(httpversion.getBytes());
  +                        output.write(toHTTPBytes(httpversion));
                           output.write(ok);
                           output.write(server);
                           if (keepalive)
  @@ -598,20 +621,22 @@
                           }
                           output.write(ctype);
                           output.write(clength);
  -                        output.write(Integer.toString(result.length)
  -                                .getBytes());
  +                        output.write(toHTTPBytes(Integer.toString
  +                                                 (result.length)));
                           output.write(doubleNewline);
                           output.write(result);
                           output.flush();
                       }
                       else
                       {
  -                        output.write(httpversion.getBytes());
  -                        output.write(" 400 Bad Request\r\n".getBytes());
  +                        output.write(toHTTPBytes(httpversion));
  +                        output.write(toHTTPBytes(" 400 Bad Request"));
  +                        output.write(newline);
                           output.write(server);
  -                        output.write("\r\n".getBytes());
  -                        output.write(("Method " + method
  -                                + " not implemented (try POST)").getBytes());
  +                        output.write(newline);
  +                        output.write(toHTTPBytes
  +                                     ("Method " + method +
  +                                      " not implemented (try POST)"));
                           output.flush();
                           keepalive = false;
                       }
  @@ -681,7 +706,7 @@
           {
               try
               {
  -                byte[] c = Base64.decode(line.substring(21).getBytes());
  +                byte[] c = Base64.decode(toHTTPBytes(line.substring(21)));
                   String str = new String(c);
                   int col = str.indexOf(':');
                   user = str.substring(0, col);
  
  
  

Mime
View raw message