ABP/Android Process chunked requests

src/sunlabs/brazil/util/http/HttpRequest.java

 /*
  * HttpRequest.java
  *
  * Brazil project web application toolkit,
  * export version: 2.3 
  * Copyright (c) 1999-2007 Sun Microsystems, Inc.
  *
  * Sun Public License Notice
  *
  * The contents of this file are subject to the Sun Public License Version 
  * 1.0 (the "License"). You may not use this file except in compliance with 
  * the License. A copy of the License is included as the file "license.terms",
  * and also available at http://www.sun.com/
  * 
  * The Original Code is from:
  *    Brazil project web application toolkit release 2.3.
  * The Initial Developer of the Original Code is: cstevens.
  * Portions created by cstevens are Copyright (C) Sun Microsystems, Inc.
  * All Rights Reserved.
  * 
  * Contributor(s): cstevens, drach, suhler.
  *
  * Version:  2.7
  * Created by cstevens on 99/09/15
  * Last modified by suhler on 07/03/26 13:53:18
  *
  * Version Histories:
+ *
+ * 13/04/09-12:44:12 (andrey@adblockplus.org)
+ *   implemented proxying chunked request body
  *
  * 2.7 07/03/26-13:53:18 (suhler)
  *   doc updates
  *
  * 2.6 07/03/26-13:44:17 (suhler)
  *   add sample main() to act as a simple "wget"
  *
  * 2.5 04/11/30-15:19:40 (suhler)
  *   fixed sccs version string
  *
@@ skipping 834 matching lines @@
         requestHeaders.print(p);
         p.print("\r\n");
 
         if (postData != null) {
             postData.writeTo(p);
             postData = null;                    // Release memory.
         }
         
         // Pass any data left in client stream (in case of chunked request content)
         String encoding = requestHeaders.get("Transfer-Encoding", "");
         if (encoding != null && encoding.equals("chunked") && cs != null)

[Felix Dahlke, 2013/04/09 09:16:48]

You could just do '"chunked".equals(encoding)' to avoid the null check.

[Andrey Novikov, 2013/04/10 08:30:30]

Done.

         {
                 byte[] buf = new byte[4096];

[Felix Dahlke, 2013/04/09 09:16:48]

Indentation is off here

                 int bytesLeft = -1;
                 while (true)
                 {
                         // Read chunk size
                         if (bytesLeft <= 0)
                         {
                                 bytesLeft = getChunkSize(cs);
                                 // Output chunk size
                                 p.print(Integer.toHexString(bytesLeft) + "\r\n");
                         }
@@ skipping 23 matching lines @@
                                 p.print(line + "\r\n");
                                 if (line.length() == 0)
                                         break;
                         }
                 }
         }
         
         p.flush();
     }
 
+    /*
+     * Copied (with some amendmends) from UnchunkingInputStream / andrey@adblockplus.org
+     */
     private int
     getChunkSize(HttpInputStream is)
         throws IOException
     {
         /*
         * Although HTTP/1.1 chunking spec says that there is one "\r\n"
         * between chunks, some servers (for example, maps.yahoo.com) 
         * send more than one blank line between chunks.  So, read and skip
         * all the blank lines seen between chunks.
         */
 
         int bytesLeft = 0;
         String line;
         do {
                 // Sanity check: limit chars when expecting a chunk size.
                 line = is.readLine(HttpRequest.LINE_LIMIT);
         } while ((line != null) && (line.length() == 0));

[Felix Dahlke, 2013/04/09 09:16:48]

Here's a shorter alternative: while("".equals(line))

[Andrey Novikov, 2013/04/10 08:30:30]

This was copied from another part of Brazil, I'll keep it as is for consistency.

 
         try {
                 bytesLeft = Integer.parseInt(line.trim(), 16);
         } catch (Exception e) {
                 throw new IOException("malformed chunk");
         }
         return bytesLeft;
     }
 
     void
@@ skipping 886 matching lines @@
             return "(null)";
         }
         StringBuffer sb = new StringBuffer();
         for (int i = 0; i < idle.size(); i++) {
             HttpSocket hs = (HttpSocket) idle.elementAt(i);
             sb.append(hs.toString() + ", ");
         }
         return sb.toString();
     }
 }