Merge r1592 from trunk (ChANGES), then edit away the 1.1.0 section.


git-svn-id: https://svn.apache.org/repos/asf/serf/branches/1.0.x@1699131 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
index be36e26..7b616ba 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,14 +1,17 @@
-Serf 1.0.3 [2012-03-20, r1586]
+Serf 1.0.3 [2012-03-20, from /tags/1.0.3, r1586]
   Map more OpenSSL errors into SERF_SSL_CERT_UNKNOWNCA (r1573)
 
+
 Serf 1.0.2
   Not released.
 
-Serf 1.0.1 [2012-02-15, r1569]
+
+Serf 1.0.1 [2012-02-15, from /tags/1.0.1, r1569]
   FreeBSD fixes in the test suite (r1560, r1565)
   Minor build fixes
 
-Serf 1.0.0 [2011-07-15, r1540]
+
+Serf 1.0.0 [2011-07-15, from /tags/1.0.0, r1540]
   Fixed issue 38: enable builds using non-GNU make
   Fixed issue 49: support SSL tunnels for HTTPS via a proxy
   Fixed issue 56: allow Subject Alternative Name, and enable SNI
@@ -29,17 +32,17 @@
   Various memory leak fixes
 
 
-Serf 0.7.2 [2011-03-12, r1452]
+Serf 0.7.2 [2011-03-12, from /tags/0.7.2, r1452]
   Actually disable Nagle when creating a connection (r1441)
   Return error when app asks for HTTPS over proxy connection (r1433)
 
 
-Serf 0.7.1 [2011-01-25, r1432]
+Serf 0.7.1 [2011-01-25, from /tags/0.7.1, r1432]
   Fix memory leak when using SSL (r1408, r1416)
   Fix build for blank apr-util directory (r1421)
 
 
-Serf 0.7.0 [2010-08-25, r1407]
+Serf 0.7.0 [2010-08-25, from /tags/0.7.0, r1407]
   Fix double free abort when destroying request buckets
   Fix test server in unit test framework to avoid random test failures
   Allow older Serf programs which don't use the new authn framework to still
@@ -49,12 +52,12 @@
   Fix HTTP header parsing to allow for empty header values
 
 
-Serf 0.6.1 [2010-05-14, r1370]
+Serf 0.6.1 [2010-05-14, from /tags/0.6.1, r1370]
   Generally: this release fixes problems with the 0.4.0 packaging
   Small compilation fix in outgoing.c for Windows builds
 
 
-Serf 0.6.0 [2010-05-14, r1363]
+Serf 0.6.0
   Not released.
 
 
@@ -62,8 +65,8 @@
   Not released.
 
 
-Serf 0.4.0 [2010-05-13, r1353]
-  [NOTE: this release misstated itself as 0.5.0; use a later release instead]
+Serf 0.4.0
+  WITHDRAWN: this release misstated itself as 0.5.0; use a later release
 
   Provide authn framework, supporting Basic, Digest, Kerberos (SSPI, GSS),
     along with proxy authn using Basic or Digest
@@ -80,14 +83,14 @@
   Added serf_lib_version() for runtime version tests
 
 
-Serf 0.3.1 [2010-02-14, r1321]
+Serf 0.3.1 [2010-02-14, from /tags/0.3.1, r1322]
   Fix loss of error on request->setup() callback. (Issue 47)
   Support APR 2.x. (Issue 48)
   Fixed slowdown in aggregate bucket with millions of child buckets
   Avoid hang in apr_pollset_poll() by unclosed connections after fork()
 
 
-Serf 0.3.0 [2009-01-26, r1217]
+Serf 0.3.0 [2009-01-26, from /tags/0.3.0, r1217]
   Support LTFLAGS override as a config-time env. variable (Issue 44)
   Fix CUTest test harness compilation on Solaris (Issue 43)
   Fix small race condition in OpenSSL initialization (Issue 39)
@@ -102,7 +105,7 @@
   Build with bundled OpenSSL builds
 
 
-Serf 0.2.0 [2008-06-06, r1189]
+Serf 0.2.0 [2008-06-06, from /tags/0.2.0, r1189]
   Enable use of external event loop: serf_create_context_ex
   Enable adding new requests at the beginning of the request queue
   Handle 'Connection:close' headers
@@ -123,7 +126,7 @@
      Do not issue double close on skt w/second one being close(-1) (Issue 33)
 
 
-Serf 0.1.2 [2007-06-18, r1115]
+Serf 0.1.2 [2007-06-18, from /tags/0.1.2, r1115]
   Enable thread-safety with OpenSSL (Issue 19)
   Teach serfmake to install headers into include/serf-0
   Be more tolerant when servers close the connection without telling us
@@ -133,7 +136,7 @@
   Fix uninitialized branch in serf_spider (Issue 15)
 
 
-Serf 0.1.1 [2007-05-12, r1105]
+Serf 0.1.1 [2007-05-12, from /tags/0.1.1, r1105]
   Add SSL client certificate support
   Implement optimized iovec reads for header buckets
   Fix up 'make clean' and 'make distclean' (Issues 9, 10)
@@ -141,5 +144,5 @@
   Remove abort() calls (Issue 13)
 
 
-Serf 0.1.0 [2006-12-14, r1087]
+Serf 0.1.0 [2006-12-14, from /tags/0.1.0, r1087]
   Initial packaged release