Index: serf/trunk/PKGBUILD
===================================================================
--- serf/trunk/PKGBUILD	(revision 190095)
+++ serf/trunk/PKGBUILD	(working copy)
@@ -2,19 +2,23 @@
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 pkgname=serf
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="High-performance asynchronous HTTP client library"
 url="http://code.google.com/p/serf/"
 arch=('i686' 'x86_64')
 license=('Apache')
 depends=('apr' 'apr-util' 'openssl' 'zlib')
-source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd')
+source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
+        r1941.patch)
+sha1sums=('f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd'
+          '5a41d51944105c98477691b20a30e1d317b69c03')
 options=('!libtool')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np0 -i $srcdir/r1941.patch
+
   ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr --with-openssl=/usr
   make
 }
Index: serf/trunk/r1941.patch
===================================================================
--- serf/trunk/r1941.patch	(revision 0)
+++ serf/trunk/r1941.patch	(working copy)
@@ -0,0 +1,28 @@
+------------------------------------------------------------------------
+r1941 | lieven.govaerts | 2013-06-22 15:21:14 +0300 (Sat, 22 Jun 2013) | 9 lines
+
+Fix 400 Bad Request returned when opening an ssl tunnel to a https server
+on a non-default port (ie. not 443).
+This fixes test test_setup_ssltunnel added in r1940.
+
+* ssltunnel.c
+  (serf__ssltunnel_connect): Use host_info.hostname to build the uri for the
+      CONNECT request. host_info.hostinfo that's used now will include the
+      port number if that's not 443.
+
+
+Index: ssltunnel.c
+===================================================================
+--- ssltunnel.c (revision 1940)
++++ ssltunnel.c (revision 1941)
+@@ -159,7 +159,7 @@
+ 
+     ctx = apr_palloc(ssltunnel_pool, sizeof(*ctx));
+     ctx->pool = ssltunnel_pool;
+-    ctx->uri = apr_psprintf(ctx->pool, "%s:%d", conn->host_info.hostinfo,
++    ctx->uri = apr_psprintf(ctx->pool, "%s:%d", conn->host_info.hostname,
+                             conn->host_info.port);
+ 
+     conn->ssltunnel_ostream = serf__bucket_stream_create(conn->allocator,
+
+------------------------------------------------------------------------