Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 8423 invoked from network); 5 Sep 2007 15:16:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Sep 2007 15:16:18 -0000 Received: (qmail 24360 invoked by uid 500); 5 Sep 2007 15:16:12 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 24302 invoked by uid 500); 5 Sep 2007 15:16:11 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 24291 invoked by uid 99); 5 Sep 2007 15:16:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Sep 2007 08:16:11 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Sep 2007 15:17:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8884D1A9832; Wed, 5 Sep 2007 08:15:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r572967 - in /geronimo/sandbox/AsyncHttpClient/src/main/java/org/apache/ahc/codec: HttpRequestEncoder.java HttpRequestMessage.java Date: Wed, 05 Sep 2007 15:15:54 -0000 To: scm@geronimo.apache.org From: jgenender@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070905151554.8884D1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jgenender Date: Wed Sep 5 08:15:53 2007 New Revision: 572967 URL: http://svn.apache.org/viewvc?rev=572967&view=rev Log: Add user agent and fix Host header Modified: geronimo/sandbox/AsyncHttpClient/src/main/java/org/apache/ahc/codec/HttpRequestEncoder.java geronimo/sandbox/AsyncHttpClient/src/main/java/org/apache/ahc/codec/HttpRequestMessage.java Modified: geronimo/sandbox/AsyncHttpClient/src/main/java/org/apache/ahc/codec/HttpRequestEncoder.java URL: http://svn.apache.org/viewvc/geronimo/sandbox/AsyncHttpClient/src/main/java/org/apache/ahc/codec/HttpRequestEncoder.java?rev=572967&r1=572966&r2=572967&view=diff ============================================================================== --- geronimo/sandbox/AsyncHttpClient/src/main/java/org/apache/ahc/codec/HttpRequestEncoder.java (original) +++ geronimo/sandbox/AsyncHttpClient/src/main/java/org/apache/ahc/codec/HttpRequestEncoder.java Wed Sep 5 08:15:53 2007 @@ -96,9 +96,19 @@ //This header is required for HTTP/1.1 buf.putString("Host: ", encoder); buf.putString(url.getHost(), encoder); - buf.putString(":", encoder); - buf.putString(url.getPort() + "", encoder); + if ((url.getProtocol().equals("http") && url.getPort() != 80 && url.getPort() != -1) && + (url.getProtocol().equals("https") && url.getPort() != 443 && url.getPort() != -1)) { + buf.putString(":", encoder); + buf.putString(url.getPort() + "", encoder); + } buf.put(CRLF); + + //User agent + if (msg.getUserAgent() != null){ + buf.putString("User-Agent: ", encoder); + buf.putString(msg.getUserAgent(), encoder); + buf.put(CRLF); + } //Process any headers we have List headers = msg.getHeaders(); Modified: geronimo/sandbox/AsyncHttpClient/src/main/java/org/apache/ahc/codec/HttpRequestMessage.java URL: http://svn.apache.org/viewvc/geronimo/sandbox/AsyncHttpClient/src/main/java/org/apache/ahc/codec/HttpRequestMessage.java?rev=572967&r1=572966&r2=572967&view=diff ============================================================================== --- geronimo/sandbox/AsyncHttpClient/src/main/java/org/apache/ahc/codec/HttpRequestMessage.java (original) +++ geronimo/sandbox/AsyncHttpClient/src/main/java/org/apache/ahc/codec/HttpRequestMessage.java Wed Sep 5 08:15:53 2007 @@ -36,6 +36,7 @@ private String requestMethod = REQUEST_GET; private String path; private Map parameters = new HashMap(); + private String userAgent = "AsyncHttpClient 1.0"; public HttpRequestMessage(String path) { @@ -86,5 +87,13 @@ public void setParameter(String name, String value){ parameters.put(name, value); + } + + public String getUserAgent() { + return userAgent; + } + + public void setUserAgent(String userAgent) { + this.userAgent = userAgent; } }