Merge lp:~wibblymat/ubuntu/oneiric/couchdb/update-to-1.1.0 into lp:ubuntu/oneiric/couchdb

[Mat Scales]

Merges the latest debian version of couchdb, updates to upstream version 1.1.0

Merge bug #817656

[Daniel Holbach (dholbach)]

Thanks a lot for your work on this. Could you please edit debian/changelog and list all the changes that we still carry on top of Debian below "Merged from Debian"? Just copying the relevant bits from older Ubuntu changelog entries would be good enough.

This would make reviewing a lot easier.

review: Needs Fixing

[Daniel Holbach (dholbach)]

Thanks a lot for your work on this. Could you please edit debian/changelog and list all the changes that we still carry on top of Debian below "Merged from Debian"? Just copying the relevant bits from older Ubuntu changelog entries would be good enough.

This would make reviewing a lot easier.

review: Needs Fixing

[Daniel Holbach (dholbach)]

libjs-jquery-form is in universe. It would need to follow https://wiki.ubuntu.com/MainInclusionProcess

[Daniel Holbach (dholbach)]

Also: are all the new erlang-* build-depends necessary - there's nothing about them in debian/changelog.

[Samuele Pedroni (pedronis)]

can confirm that the dropped patches are superseded

desktopcouch tests pass with a locally built version of this, same for the smoke-test internal U1 replication test

[Sebastien Bacher (seb128)]

You will also need a feature freeze exception granted to get that on in Oneiric, setting to Work in progress until Daniel's points about the mir and build depends and changelog points are adressed, you should set it back to "Needs review" once you have an update adressing those

[Daniel Holbach (dholbach)]

Relevant links:

 * https://wiki.ubuntu.com/FreezeExceptionProcess
 * https://wiki.ubuntu.com/MainInclusionProcess

[John Lenton (chipaca)]

Is there a reason the dependency on libjs-jquery-form can't be made a recommends instead?

[Michael Chang (thenewme91)]

The current couchdb-bin package in oneiric contains the contents of libjs-jquery-form verbatim (i.e. jquery.form.js), albeit a version from Nov 2009; if it's in oneiric it makes more sense to point to a single updated copy in a package in the repos then to have two copies (one in couchdb and one in libjs-jquery-form).

Also, couchdb-bin currently depends on libjs-jquery in a similar fashion.

[Michael Chang (thenewme91)]

libjs-jquery-form recommends javascript-common; either this will will need to be changed to suggests or javascript-common will need to also have a MIR.
javascript-common depends on wwwconfig-common, so if adding a MIR for javascript-common, also need one for wwwconfig-common.

Note that libjs-jquery only suggests javascript-common, not recommends it.

Note that libjs-jquery-form is new in oneiric (appears to have come from the autosync with Debian unstable).

[Mat Scales (wibblymat)]

A note on the diff between the Debian version and my version. If you see the bug at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635762 there was some regression in the Debian version. I submitted a patch that would fix things up but the Debian maintainer appears to be AWOL.

This branch fixes that regression, which is the largest source of difference. I'll update the changelog to state that along with which Ubuntu patches we sill have.

[Mat Scales (wibblymat)]

The erlang-* build dependencies replace the erlang-nox dependency. erlang-nox depends on a whole bunch of other packages, including ones we don't need. Only erlang-eunit is actually new since the last Ubuntu version, a new dependency upstream.

[James Page (james-page)]

1.1.0-2 is now in Debian testing - which looks like it may resolve some of the regressions in the Debian version.

Please can this merge proposal be revised in light of this new Debian version.

Thanks

review: Needs Fixing

Unmerged revisions

63. By Mat Scales on 2011-09-05

Updated the changelog to make it easier to spot changes:

* Fixed a regression in the latest debian version
  - See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635762
* Ubuntu changes still remaining:
  - moz000*.patch: Build against spidermonkey 1.8.5:
  - init.patch: Improved init script
  - fix-help2man.patch: Build with newer versions of help2man

62. By Mat Scales on 2011-07-28

Use the same version of autotools to rebuild moz0003 as was used by the previous uploader to keep the diff smaller.

61. By Mat Scales on 2011-07-28

* Merge from debian unstable.
  - New upstream release (closes: #590334).
  - Empty dependency_libs in *.la (closes: #621202).
  - Fix several lintian errors and warnings:
    - use real erlang dependency, not just the virtual ABI one
    - remove embedded jquery.form.js , depend on its package

* Removed superceded patches:
  - couchio-fix-0001-replicator_redirect_atts.patch
  - couchio-fix-0002-replicator_db_proxy_fix.patch
  - couchio-fix-0003-changes_redirect_1.patch
  - couchio-fix-0004-changes_redirect_2.patch
  - couchio-fix-0005-changes_proxy.patch
  - couchio-fix-0006-replicator_reader_errors.patch
  - couchio-fix-0007-ibrowse_upgrade.patch
  - couchio-fix-0008-replicator_doc_id_encoding.patch
  - couchio-fix-0009-replicator_changes_error.patch
  - couchio-fix-0010-replicator_changes_connection_close.patch
  - couchio-fix-0011-ibrowse_chunked_encoding_streaming.patch
  - couchio-fix-0012-replicator_ssl.patch
  - jquery15-fix.patch
* Rebuilt debian/patches/moz0003-spidermonkey1.8.5_autotools.patch

60. By Mat Scales on 2011-07-23

Patch has been partly superceded, updating.

59. By Mat Scales on 2011-07-23

Another superceded patch

58. By Mat Scales on 2011-07-23

Looks like all the CouchIO fixes were applied or superceded upstream.

57. By Mat Scales on 2011-07-23

Some extraneous files were not removed by the upstream merge though they aren't included in the latest version of upstream.

56. By Mat Scales on 2011-07-23

* New upstream release (1.1.0)
* Begun removing patches that are no longer needed

=== modified file 'AUTHORS'
--- AUTHORS	2010-07-26 10:24:11 +0000
+++ AUTHORS	2011-09-06 14:51:24 +0000
@@ -15,6 +15,6 @@
  * Mark Hammond <[e-mail]>
  * Benoît Chesneau <[e-mail]>
  * Filipe Manana <[e-mail]>
- * Robert Newson <[e-mail]>
+ * Robert Newson <[e-mail]>
 
 For a list of other credits see the `THANKS` file.

=== modified file 'CHANGES'
--- CHANGES	2010-08-16 19:45:48 +0000
+++ CHANGES	2011-09-06 14:51:24 +0000
@@ -1,6 +1,61 @@
 Apache CouchDB CHANGES
 ======================
 
+Version 1.1.0
+-------------
+
+All CHANGES for 1.0.2 and 1.0.3 also apply to 1.1.0.
+
+HTTP Interface:
+
+ * Native SSL support.
+ * Added support for HTTP range requests for attachments.
+ * Added built-in filters for `_changes`: `_doc_ids` and `_design`.
+ * Added configuration option for TCP_NODELAY aka "Nagle".
+ * Allow POSTing arguments to `_changes`.
+ * Allow `keys` parameter for GET requests to views.
+ * Allow wildcards in vhosts definitions.
+ * More granular ETag support for views.
+ * More flexible URL rewriter.
+ * Added support for recognizing "Q values" and media parameters in
+   HTTP Accept headers.
+ * Validate doc ids that come from a PUT to a URL.
+
+Externals:
+
+ * Added OS Process module to manage daemons outside of CouchDB.
+ * Added HTTP Proxy handler for more scalable externals.
+
+Replicator:
+
+ * Added `_replicator` database to manage replications.
+ * Fixed issues when an endpoint is a remote database accessible via SSL.
+ * Added support for continuous by-doc-IDs replication.
+ * Fix issue where revision info was omitted when replicating attachments.
+ * Integrity of attachment replication is now verified by MD5.
+
+Storage System:
+
+ * Multiple micro-optimizations when reading data.
+
+View Server:
+
+ * Added CommonJS support to map functions.
+ * Added `stale=update_after` query option that triggers a view update after
+   returning a `stale=ok` response.
+ * Warn about empty result caused by `startkey` and `endkey` limiting.
+ * Built-in reduce function `_sum` now accepts lists of integers as input.
+ * Added view query aliases start_key, end_key, start_key_doc_id and
+   end_key_doc_id.
+
+Futon:
+
+ * Added a "change password"-feature to Futon.
+
+URL Rewriter & Vhosts:
+
+ * Fix for variable substituion
+
 Version 1.0.1
 -------------
 
@@ -11,7 +66,7 @@
 
 Replicator:
 
-  * Added support for replication via an HTTP/HTTP proxy.
+  * Added support for replication via an HTTP/HTTPS proxy.
   * Fix pull replication of attachments from 0.11 to 1.0.x.
   * Make the _changes feed work with non-integer seqnums.
 

=== modified file 'INSTALL'
--- INSTALL	2010-07-26 10:24:11 +0000
+++ INSTALL	2011-09-06 14:51:24 +0000
@@ -4,8 +4,10 @@
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
@@ -13,7 +15,11 @@
    Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,8 +83,15 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
@@ -93,7 +116,8 @@
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@@ -120,7 +144,8 @@
    By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -131,15 +156,46 @@
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Particular systems
 ==================
 
@@ -288,7 +351,7 @@
      `configure' can determine that directory automatically.
 
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.
 

=== modified file 'INSTALL.Windows'
--- INSTALL.Windows	2010-07-26 10:24:11 +0000
+++ INSTALL.Windows	2011-09-06 14:51:24 +0000
@@ -8,7 +8,7 @@
 
 You will need the following installed:
 
- * Erlang OTP (>=R12B5)       (http://erlang.org/)
+ * Erlang OTP (=14B01)        (http://erlang.org/)
  * ICU                        (http://icu.sourceforge.net/)
  * OpenSSL                    (http://www.openssl.org/)
  * Mozilla SpiderMonkey (1.8) (http://www.mozilla.org/js/spidermonkey/)
@@ -50,12 +50,17 @@
 
     * The `which cl` command points to the Microsoft compiler.
 
-If you do not do this, the ones found in `/usr/bin` may be used instead.
+    * The `which mc` command points to the Microsoft message compiler.
+
+    * The `which mt` command points to the Microsoft manifest tool.
+
+If you do not do this, the build may fail due to Cygwin ones found in `/usr/bin`
+being used instead.
 
 Building Erlang
 ---------------
 
-You must include OpenSSL.
+You must include Win32 OpenSSL.
 
 However, you can skip the GUI tools by running:
 
@@ -89,7 +94,7 @@
 
 To set up your path, run:
 
-    export PATH=$ERL_TOP/release/win32/erts-5.7.2/bin:$PATH
+    export PATH=$ERL_TOP/release/win32/erts-5.8.2/bin:$PATH
 
 If everything was successful, you should be ready to build CouchDB.
 
@@ -101,8 +106,8 @@
 Once you have satisfied the dependencies you should run:
 
     ./configure \
-        --with-js-include=/cygdrive/c/path_to_seamonkey_include \
-        --with-js-lib=/cygdrive/c/path_to_seamonkey_lib \
+        --with-js-include=/cygdrive/c/path_to_spidermonkey_include \
+        --with-js-lib=/cygdrive/c/path_to_spidermonkey_lib \
         --with-win32-icu-binaries=/cygdrive/c/path_to_icu_binaries_root \
         --with-erlang=$ERL_TOP/release/win32/usr/include \
         --with-win32-curl=/cygdrive/c/path/to/curl/root/directory \
@@ -145,4 +150,4 @@
 
     http://127.0.0.1:5984/_utils/index.html
 
-From here you should run the test suite.
+From here you should run the test suite in either Firefox 3.6+ or Safari 4+.

=== modified file 'LICENSE'
--- LICENSE	2009-10-13 16:50:35 +0000
+++ LICENSE	2011-09-06 14:51:24 +0000
@@ -239,6 +239,35 @@
   OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+For the share/www/script/jquery-ui-1.8.11.custom.min.js and
+    share/www/style/jquery-ui-1.8.11.custom.css components:
+
+  Copyright (c) 2011 Paul Bakaus, http://jqueryui.com/
+
+  This software consists of voluntary contributions made by many
+  individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
+  contribution history, see the revision history and logs, available
+  at http://jquery-ui.googlecode.com/svn/
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 For the share/www/script/jquery.form.js component:
 
   http://malsup.com/jquery/form/

=== modified file 'Makefile.am'
--- Makefile.am	2010-08-16 19:45:48 +0000
+++ Makefile.am	2011-09-06 14:51:24 +0000
@@ -140,7 +140,7 @@
 distsign: distcheck check
 	@# @@ unpack archive and run diff -r to double check missing files
 	@# @@ does automake have anything that does this?
-	gpg --armor --detach-sig --default-key 8FBFCFBF \
+	gpg --armor --detach-sig --default-key DF3CEBA3 \
 	    < $(top_srcdir)/$(distdir).tar.gz \
 	    > $(top_srcdir)/$(distdir).tar.gz.asc
 	md5sum $(top_srcdir)/$(distdir).tar.gz \

=== modified file 'Makefile.in'
--- Makefile.in	2010-08-16 19:45:48 +0000
+++ Makefile.in	2011-09-06 14:51:24 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -412,7 +412,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -437,7 +437,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -604,7 +604,8 @@
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
 	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -648,17 +649,17 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
@@ -941,7 +942,7 @@
 distsign: distcheck check
 	@# @@ unpack archive and run diff -r to double check missing files
 	@# @@ does automake have anything that does this?
-	gpg --armor --detach-sig --default-key 8FBFCFBF \
+	gpg --armor --detach-sig --default-key DF3CEBA3 \
 	    < $(top_srcdir)/$(distdir).tar.gz \
 	    > $(top_srcdir)/$(distdir).tar.gz.asc
 	md5sum $(top_srcdir)/$(distdir).tar.gz \

=== modified file 'NEWS'
--- NEWS	2010-08-16 19:45:48 +0000
+++ NEWS	2011-09-06 14:51:24 +0000
@@ -7,12 +7,37 @@
 
 Each release section notes when backwards incompatible changes have been made.
 
+Version 1.1.0
+-------------
+
+All NEWS for 1.0.2 also apply to 1.1.0.
+
+This release contains backwards incompatible changes.
+
+ * Native SSL support.
+ * Added support for HTTP range requests for attachments.
+ * Added built-in filters for `_changes`: `_doc_ids` and `_design`.
+ * Added configuration option for TCP_NODELAY aka "Nagle".
+ * Allow wildcards in vhosts definitions.
+ * More granular ETag support for views.
+ * More flexible URL rewriter.
+ * Added OS Process module to manage daemons outside of CouchDB.
+ * Added HTTP Proxy handler for more scalable externals.
+ * Added `_replicator` database to manage replications.
+ * Multiple micro-optimizations when reading data.
+ * Added CommonJS support to map functions.
+ * Added `stale=update_after` query option that triggers a view update after
+   returning a `stale=ok` response.
+ * More explicit error messages when it's not possible to access a file due
+   to lack of permissions.
+ * Added a "change password"-feature to Futon.
+
 Version 1.0.1
 -------------
 
   * Fix data corruption bug COUCHDB-844. Please see
     http://couchdb.apache.org/notice/1.0.1.html for details.
-  * Added support for replication via an HTTP/HTTP proxy.
+  * Added support for replication via an HTTP/HTTPS proxy.
   * Fixed various replicator bugs for interop with older CouchDB versions.
   * Show fields saved along with _deleted=true. Allows for auditing of deletes.
   * Enable basic-auth popup when required to access the server, to prevent
@@ -38,6 +63,7 @@
   * User documents can now be deleted by admins or the user.
   * Avoid potential DOS attack by guarding all creation of atoms.
   * Some Futon and JavaScript library bugfixes.
+  * Fixed CVE-2010-2234: Apache CouchDB Cross Site Request Forgery Attack
 
 Version 0.11.1
 --------------
@@ -143,7 +169,7 @@
 Version 0.10.0
 --------------
 
-This release contains backwards incompatible changes, please see above for help.
+This release contains backwards incompatible changes.
 
  * General performance improvements.
  * View index generation speedups.
@@ -175,7 +201,7 @@
 Version 0.9.0
 -------------
 
-This release contains backwards incompatible changes, please see above for help.
+This release contains backwards incompatible changes.
 
  * Modular configuration.
  * Performance enhancements for document and view access.
@@ -199,7 +225,7 @@
 Version 0.8.0-incubating
 ------------------------
 
-This release contains backwards incompatible changes, please see above for help.
+This release contains backwards incompatible changes.
 
  * Changed core licensing to the Apache Software License 2.0.
  * Refactoring of the core view and storage engines.

=== modified file 'NOTICE'
--- NOTICE	2010-07-26 10:24:11 +0000
+++ NOTICE	2011-09-06 14:51:24 +0000
@@ -17,6 +17,10 @@
  * jQuery (http://jquery.com/)
 
    Copyright 2010, John Resig
+ 
+ * jQuery UI (http://jqueryui.com)
+
+   Copyright 2011, Paul Bakaus
 
  * json2.js (http://www.json.org/)
 
@@ -46,6 +50,6 @@
 
    Copyright 1999, Masanao Izumo <[e-mail]>
 
-* jspec.js (http://visionmedia.github.com/jspec/)
+ * jspec.js (http://visionmedia.github.com/jspec/)
 
   Copyright 2010 TJ Holowaychuk <[e-mail]>

=== modified file 'THANKS'
--- THANKS	2010-08-16 19:45:48 +0000
+++ THANKS	2011-09-06 14:51:24 +0000
@@ -63,7 +63,23 @@
  * Paul Bonser <[e-mail]>
  * Caleb Land <[e-mail]>
  * Juhani Ränkimies <[e-mail]>
+ * Kev Jackson <[e-mail]>
+ * Jonathan D. Knezek <[e-mail]>
+ * David Rose <[e-mail]>
  * Lim Yue Chuan <[e-mail]>
  * David Davis <[e-mail]>
+ * Klaus Trainer <[e-mail]>
+ * Dale Harvey <[e-mail]>
+ * Juuso Väänänen <[e-mail]>
+ * Jeff Zellner <[e-mail]>
+ * Benjamin Young <[e-mail]>
+ * Gabriel Farrell <[e-mail]>
+ * Mike Leddy <[e-mail]>
+ * Felix Hummel <[e-mail]>
+ * Tim Smith <[e-mail]>
+ * Sam Bisbee <[e-mail]>
+ * Nathan Vander Wilt <[e-mail]>
+ * Caolan McMahon <[e-mail]>
+ 
 
 For a list of authors see the `AUTHORS` file.

=== modified file 'acinclude.m4'
--- acinclude.m4	2010-08-16 19:45:48 +0000
+++ acinclude.m4	2011-09-06 14:51:24 +0000
@@ -17,8 +17,8 @@
 m4_define([LOCAL_PACKAGE_NAME], [Apache CouchDB])
 m4_define([LOCAL_BUG_URI], [https://issues.apache.org/jira/browse/COUCHDB])
 m4_define([LOCAL_VERSION_MAJOR], [1])
-m4_define([LOCAL_VERSION_MINOR], [0])
-m4_define([LOCAL_VERSION_REVISION], [1])
+m4_define([LOCAL_VERSION_MINOR], [1])
+m4_define([LOCAL_VERSION_REVISION], [0])
 m4_define([LOCAL_VERSION_STAGE], [])
 m4_define([LOCAL_VERSION_RELEASE], [])
 m4_define([LOCAL_VERSION_PRIMARY],

=== modified file 'aclocal.m4'
--- aclocal.m4	2010-07-26 10:24:11 +0000
+++ aclocal.m4	2011-09-06 14:51:24 +0000
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -34,7 +34,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,7 +50,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

=== modified file 'bin/Makefile.in'
--- bin/Makefile.in	2010-07-26 10:24:11 +0000
+++ bin/Makefile.in	2011-09-06 14:51:24 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

=== removed file 'bin/couchdb.1'
--- bin/couchdb.1	2010-08-16 19:45:48 +0000
+++ bin/couchdb.1	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH COUCHDB "1" "August 2010" "couchdb - Apache CouchDB 1.0.1" "User Commands"
-.SH NAME
-couchdb \- Apache CouchDB database server
-.SH SYNOPSIS
-.B couchdb
-[\fIOPTION\fR]
-.SH DESCRIPTION
-The couchdb command runs the Apache CouchDB server.
-.PP
-Erlang is called with:
-.HP
-\fB\-sasl\fR errlog_type error +K true +A 4
-.PP
-Erlang inherits the environment of this command.
-.PP
-You can override these options using the environment:
-.IP
-ERL_AFLAGS, ERL_FLAGS, ERL_ZFLAGS
-.PP
-See erl(1) for more information about the environment variables.
-.PP
-The exit status is 0 for success or 1 for failure.
-.SH OPTIONS
-
-.TP
-\fB\-h\fR
-display a short help message and exit
-.TP
-\fB\-V\fR
-display version information and exit
-.TP
-\fB\-a\fR FILE
-add configuration FILE to chain
-.TP
-\fB\-A\fR DIR
-add configuration DIR to chain
-.TP
-\fB\-n\fR
-reset configuration file chain (including system default)
-.TP
-\fB\-c\fR
-print configuration file chain and exit
-.TP
-\fB\-i\fR
-use the interactive Erlang shell
-.TP
-\fB\-b\fR
-spawn as a background process
-.TP
-\fB\-p\fR FILE
-set the background PID FILE (overrides system default)
-.TP
-\fB\-r\fR SECONDS
-respawn background process after SECONDS (defaults to no respawn)
-.TP
-\fB\-o\fR FILE
-redirect background stdout to FILE (defaults to couchdb.stdout)
-.TP
-\fB\-e\fR FILE
-redirect background stderr to FILE (defaults to couchdb.stderr)
-.TP
-\fB\-s\fR
-display the status of the background process
-.TP
-\fB\-k\fR
-kill the background process, will respawn if needed
-.TP
-\fB\-d\fR
-shutdown the background process
-.SH "REPORTING BUGS"
-Report bugs at <https://issues.apache.org/jira/browse/COUCHDB>.
-.PP
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at
-.IP
-http://www.apache.org/licenses/LICENSE\-2.0
-.PP
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.

=== removed file 'bin/couchjs.1'
--- bin/couchjs.1	2010-08-16 19:45:48 +0000
+++ bin/couchjs.1	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH COUCHJS "1" "August 2010" "couchjs - Apache CouchDB 1.0.1" "User Commands"
-.SH NAME
-couchjs \- Apache CouchDB JavaScript interpreter
-.SH SYNOPSIS
-.B couchjs
-[\fIFILE\fR]
-.SH DESCRIPTION
-The couchjs command runs the Apache CouchDB JavaScript interpreter.
-.PP
-The exit status is 0 for success or 1 for failure.
-.SH OPTIONS
-
-.TP
-\fB\-h\fR
-display a short help message and exit
-.TP
-\fB\-V\fR
-display version information and exit
-.SH "REPORTING BUGS"
-Report bugs at <https://issues.apache.org/jira/browse/COUCHDB>.
-.PP
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at
-.IP
-http://www.apache.org/licenses/LICENSE\-2.0
-.PP
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.

=== modified file 'build-aux/config.guess'
--- build-aux/config.guess	2009-08-31 09:06:26 +0000
+++ build-aux/config.guess	2011-09-06 14:51:24 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-27'
+timestamp='2009-12-30'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <[e-mail]>.
-# Please send patches to <[e-mail]>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <[e-mail]> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +56,9 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -170,7 +171,7 @@
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -333,6 +334,9 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -656,7 +660,7 @@
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -807,12 +811,12 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
     	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -822,6 +826,9 @@
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -851,6 +858,20 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -873,6 +894,17 @@
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -882,78 +914,34 @@
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -962,8 +950,11 @@
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -986,66 +977,6 @@
     xtensa*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1074,7 +1005,7 @@
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1182,7 +1113,7 @@
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1275,6 +1206,16 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}

=== modified file 'build-aux/config.sub'
--- build-aux/config.sub	2009-08-31 09:06:26 +0000
+++ build-aux/config.sub	2011-09-06 14:51:24 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-17'
+timestamp='2010-01-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@
 
 
 # Please send patches to <[e-mail]>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -72,8 +75,9 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,10 +153,13 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -281,6 +288,7 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -288,13 +296,14 @@
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -337,7 +346,7 @@
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -365,15 +374,17 @@
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -467,6 +478,10 @@
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -719,6 +734,9 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -1069,6 +1087,11 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+        # This must be matched before tile*.
+        tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
+		;;
 	tile*)
 		basic_machine=tile-unknown
 		os=-linux-gnu
@@ -1240,6 +1263,9 @@
         # First match some system type aliases
         # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1260,9 +1286,9 @@
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1283,7 +1309,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1416,6 +1442,8 @@
 	-dicos*)
 		os=-dicos
 		;;
+        -nacl*)
+	        ;;
 	-none)
 		;;
 	*)
@@ -1613,7 +1641,7 @@
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)

=== modified file 'build-aux/ltmain.sh'
--- build-aux/ltmain.sh	2010-07-26 10:24:11 +0000
+++ build-aux/ltmain.sh	2011-09-06 14:51:24 +0000
@@ -1,6 +1,6 @@
 # Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6
+# ltmain.sh (GNU libtool) 2.2.6b
 # Written by Gordon Matzigkeit <[e-mail]>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6
+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,9 +73,9 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=2.2.6
+VERSION="2.2.6b Debian-2.2.6b-2"
 TIMESTAMP=""
-package_revision=1.3012
+package_revision=1.3017
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -116,15 +116,15 @@
 
 : ${CP="cp -f"}
 : ${ECHO="echo"}
-: ${EGREP="/usr/bin/grep -E"}
-: ${FGREP="/usr/bin/grep -F"}
-: ${GREP="/usr/bin/grep"}
+: ${EGREP="/bin/grep -E"}
+: ${FGREP="/bin/grep -F"}
+: ${GREP="/bin/grep"}
 : ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/opt/local/bin/gsed"}
+: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -5033,7 +5033,10 @@
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -5344,19 +5347,19 @@
 	    # It is a libtool convenience library, so add in its objects.
 	    convenience="$convenience $ladir/$objdir/$old_library"
 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+	      if $opt_duplicate_deps ; then
+		case "$tmp_libs " in
+		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+		esac
+	      fi
+	      tmp_libs="$tmp_libs $deplib"
+	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    deplibs="$deplib $deplibs"
-	    if $opt_duplicate_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
 	  continue
 	fi # $pass = conv
 
@@ -5893,6 +5896,7 @@
 	  if test "$link_all_deplibs" != no; then
 	    # Add the search paths of all dependency libraries
 	    for deplib in $dependency_libs; do
+	      path=
 	      case $deplib in
 	      -L*) path="$deplib" ;;
 	      *.la)
@@ -6206,6 +6210,9 @@
 	    revision="$number_minor"
 	    lt_irix_increment=no
 	    ;;
+	  *)
+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+	    ;;
 	  esac
 	  ;;
 	no)

=== modified file 'configure'
--- configure	2010-08-16 19:45:48 +0000
+++ configure	2011-09-06 14:51:24 +0000
@@ -1,12 +1,14 @@
 #! /bin/sh
-# From configure.ac 1.0.1.
+# From configure.ac 1.1.0.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for Apache CouchDB 1.0.1.
+# Generated by GNU Autoconf 2.67 for Apache CouchDB 1.1.0.
+#
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.
 #
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -315,7 +317,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -355,19 +357,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -674,10 +676,11 @@
 
 
 
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -696,8 +699,8 @@
 # Identity of this package.
 PACKAGE_NAME='Apache CouchDB'
 PACKAGE_TARNAME='apache-couchdb'
-PACKAGE_VERSION='1.0.1'
-PACKAGE_STRING='Apache CouchDB 1.0.1'
+PACKAGE_VERSION='1.1.0'
+PACKAGE_STRING='Apache CouchDB 1.1.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1000,8 +1003,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1046,7 +1050,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1072,7 +1076,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1276,7 +1280,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1292,7 +1296,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1322,8 +1326,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1331,7 +1335,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1349,13 +1353,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1378,7 +1382,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1392,8 +1396,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1408,9 +1412,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1449,11 +1453,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1479,7 +1483,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Apache CouchDB 1.0.1 to adapt to many kinds of systems.
+\`configure' configures Apache CouchDB 1.1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1493,7 +1497,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1549,7 +1553,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Apache CouchDB 1.0.1:";;
+     short | recursive ) echo "Configuration of Apache CouchDB 1.1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1592,7 +1596,7 @@
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   ERLC_FLAGS  general flags to prepend to ERLC_FLAGS
@@ -1668,10 +1672,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Apache CouchDB configure 1.0.1
-generated by GNU Autoconf 2.64
+Apache CouchDB configure 1.1.0
+generated by GNU Autoconf 2.67
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1716,7 +1720,7 @@
 	ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
 
@@ -1741,7 +1745,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1753,7 +1757,7 @@
     ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
 
@@ -1765,10 +1769,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  if eval "test \"\${$3+set}\"" = set; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1804,7 +1808,7 @@
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -1831,7 +1835,7 @@
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -1882,7 +1886,7 @@
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
 
@@ -1895,7 +1899,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1959,7 +1963,7 @@
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
 
@@ -1971,7 +1975,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2033,8 +2037,8 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Apache CouchDB $as_me 1.0.1, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+It was created by Apache CouchDB $as_me 1.1.0, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
 
@@ -2144,11 +2148,9 @@
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2182,11 +2184,9 @@
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2199,11 +2199,9 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -2217,11 +2215,9 @@
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -2276,7 +2272,12 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2287,18 +2288,22 @@
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5 ; }
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
@@ -2367,7 +2372,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2386,16 +2391,22 @@
 
 ac_aux_dir=
 for ac_dir in build-aux "$srcdir"/build-aux; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2518,11 +2529,11 @@
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2544,7 +2555,7 @@
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" "$LINENO" 5
    fi
 
@@ -2554,7 +2565,7 @@
    # Ok.
    :
 else
-   as_fn_error "newly created file is older than distributed files!
+   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2726,6 +2737,7 @@
 
 fi
 
+  test -d ./--version && rmdir ./--version
   if test "${ac_cv_path_mkdir+set}" = set; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
@@ -2733,7 +2745,6 @@
     # value for MKDIR_P within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
@@ -2792,7 +2803,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2800,7 +2811,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2834,7 +2845,7 @@
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2850,7 +2861,7 @@
 
 # Define the identity of the package.
  PACKAGE='apache-couchdb'
- VERSION='1.0.1'
+ VERSION='1.1.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3253,8 +3264,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3275,32 +3286,30 @@
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+
 int
 main ()
 {
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
@@ -3362,62 +3371,28 @@
 else
   ac_file=''
 fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5 ; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
 $as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then :
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
-fi
 ac_exeext=$ac_cv_exeext
 
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
@@ -3447,16 +3422,75 @@
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
-rm -f conftest$ac_cv_exeext
+rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5 ; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then :
@@ -3499,8 +3533,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3890,7 +3924,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -3906,11 +3940,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -3949,7 +3983,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -3965,18 +3999,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -4037,7 +4071,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -4103,7 +4137,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4235,8 +4269,7 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -4671,8 +4704,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4693,8 +4726,8 @@
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
@@ -5046,8 +5079,8 @@
 
 
 
-macro_version='2.2.6'
-macro_revision='1.3012'
+macro_version='2.2.6b'
+macro_revision='1.3017'
 
 
 
@@ -5065,7 +5098,7 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
@@ -5076,16 +5109,16 @@
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -5110,7 +5143,7 @@
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -5118,7 +5151,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -5191,7 +5224,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
@@ -5270,7 +5303,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -5386,7 +5419,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -5588,13 +5621,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5591: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5624: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5594: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5627: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5597: output\"" >&5)
+  (eval echo "\"\$as_me:5630: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6060,11 +6093,11 @@
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -6799,7 +6832,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6802 "configure"' > conftest.$ac_ext
+  echo '#line 6835 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8001,11 +8034,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8004: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8037: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8008: \$? = $ac_status" >&5
+   echo "$as_me:8041: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8170,7 +8203,7 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -8340,11 +8373,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8343: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8376: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8347: \$? = $ac_status" >&5
+   echo "$as_me:8380: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8445,11 +8478,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8448: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8481: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8452: \$? = $ac_status" >&5
+   echo "$as_me:8485: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8500,11 +8533,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8503: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8536: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8507: \$? = $ac_status" >&5
+   echo "$as_me:8540: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8619,6 +8652,9 @@
   openbsd*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu)
+    link_all_deplibs=no
+    ;;
   esac
 
   ld_shlibs=yes
@@ -8640,6 +8676,7 @@
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -8731,7 +8768,7 @@
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
 	case $cc_basename in
@@ -8801,7 +8838,7 @@
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -8976,6 +9013,7 @@
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
+	link_all_deplibs=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -9302,7 +9340,7 @@
       link_all_deplibs=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -10192,7 +10230,7 @@
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -10247,6 +10285,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -10867,7 +10917,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10870 "configure"
+#line 10920 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10963,7 +11013,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10966 "configure"
+#line 11016 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11482,7 +11532,7 @@
   JS_LIB_BASE=js32
 else
 
-                as_fn_error "Could not find the js library.
+                as_fn_error $? "Could not find the js library.
 
 Is the Mozilla SpiderMonkey library installed?" "$LINENO" 5
 fi
@@ -11505,7 +11555,7 @@
         if test -f "$JS_LIB_DIR/../bin/$JS_LIB_BASE.dll"; then
             JS_LIB_BINARY="$JS_LIB_DIR/../bin/$JS_LIB_BASE.dll"
         else
-        as_fn_error "Could not find $JS_LIB_BASE.dll." "$LINENO" 5
+        as_fn_error $? "Could not find $JS_LIB_BASE.dll." "$LINENO" 5
         fi
     fi
 
@@ -11602,7 +11652,7 @@
 
 else
 
-            as_fn_error "Could not find the jsapi header.
+            as_fn_error $? "Could not find the jsapi header.
 
 Are the Mozilla SpiderMonkey headers installed?" "$LINENO" 5
 
@@ -11756,7 +11806,7 @@
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (ICU) not met." "$LINENO" 5
+     as_fn_error $? "Library requirements (ICU) not met." "$LINENO" 5
   fi
 
     ICU_LOCAL_CFLAGS=`$ICU_CONFIG --cppflags-searchpath`
@@ -11869,7 +11919,7 @@
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (curl) not met." "$LINENO" 5
+     as_fn_error $? "Library requirements (curl) not met." "$LINENO" 5
   fi
 
     CURL_LDFLAGS=-lcurl
@@ -11936,7 +11986,7 @@
 
 
 if test x${ERL} = x; then
-    as_fn_error "Could not find the \`erl' executable. Is Erlang installed?" "$LINENO" 5
+    as_fn_error $? "Could not find the \`erl' executable. Is Erlang installed?" "$LINENO" 5
 fi
 
 erlang_version_error="The installed Erlang version is less than 5.6.5 (R12B05)."
@@ -11944,19 +11994,25 @@
 version="`${ERL} -version 2>&1 | ${SED} "s/[^0-9]/ /g"`"
 
 if test `echo $version | ${AWK} "{print \\$1}"` -lt 5; then
-    as_fn_error "$erlang_version_error" "$LINENO" 5
+    as_fn_error $? "$erlang_version_error" "$LINENO" 5
 fi
 
 if test `echo $version | ${AWK} "{print \\$2}"` -lt 6; then
-    as_fn_error "$erlang_version_error" "$LINENO" 5
+    as_fn_error $? "$erlang_version_error" "$LINENO" 5
 fi
 
 if test `echo $version | ${AWK} "{print \\$2}"` -eq 6; then
     if test `echo $version | ${AWK} "{print \\$3}"` -lt 5; then
-        as_fn_error "$erlang_version_error" "$LINENO" 5
+        as_fn_error $? "$erlang_version_error" "$LINENO" 5
     fi
 fi
 
+has_crypto=`${ERL} -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop`
+
+if test -n "$has_crypto"; then
+    as_fn_error $? "Could not find the Erlang crypto library. Has Erlang been compiled with OpenSSL support?" "$LINENO" 5
+fi
+
 # Extract the first word of "erlc", so it can be a program name with args.
 set dummy erlc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -11999,7 +12055,7 @@
 
 
 if test x${ERLC} = x; then
-    as_fn_error "Could not find the \`erlc' executable. Is Erlang installed?" "$LINENO" 5
+    as_fn_error $? "Could not find the \`erlc' executable. Is Erlang installed?" "$LINENO" 5
 fi
 
 ac_fn_c_check_header_mongrel "$LINENO" "erl_driver.h" "ac_cv_header_erl_driver_h" "$ac_includes_default"
@@ -12007,7 +12063,7 @@
 
 else
 
-    as_fn_error "Could not find the \`erl_driver.h' header.
+    as_fn_error $? "Could not find the \`erl_driver.h' header.
 
 Are the Erlang headers installed? Use the \`--with-erlang' option to specify the
 path to the Erlang include directory." "$LINENO" 5
@@ -12171,13 +12227,13 @@
 package_name="Apache CouchDB"
 
 
-version="1.0.1"
+version="1.1.0"
 
 version_major="1"
 
-version_minor="0"
+version_minor="1"
 
-version_revision="1"
+version_revision="0"
 
 version_stage=""
 
@@ -12371,6 +12427,7 @@
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -12394,31 +12451,31 @@
 fi
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WINDOWS_TRUE}" && test -z "${WINDOWS_FALSE}"; then
-  as_fn_error "conditional \"WINDOWS\" was never defined.
+  as_fn_error $? "conditional \"WINDOWS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INIT_TRUE}" && test -z "${INIT_FALSE}"; then
-  as_fn_error "conditional \"INIT\" was never defined.
+  as_fn_error $? "conditional \"INIT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LAUNCHD_TRUE}" && test -z "${LAUNCHD_FALSE}"; then
-  as_fn_error "conditional \"LAUNCHD\" was never defined.
+  as_fn_error $? "conditional \"LAUNCHD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HELP2MAN_TRUE}" && test -z "${HELP2MAN_FALSE}"; then
-  as_fn_error "conditional \"HELP2MAN\" was never defined.
+  as_fn_error $? "conditional \"HELP2MAN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -12568,19 +12625,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -12776,7 +12833,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -12829,8 +12886,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Apache CouchDB $as_me 1.0.1, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+This file was extended by Apache CouchDB $as_me 1.1.0, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -12870,6 +12927,7 @@
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -12892,12 +12950,13 @@
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Apache CouchDB config.status 1.0.1
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+Apache CouchDB config.status 1.1.0
+configured by $0, generated by GNU Autoconf 2.67,
+  with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -12915,11 +12974,16 @@
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -12933,12 +12997,15 @@
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -12951,7 +13018,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -12960,7 +13027,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -13306,7 +13373,7 @@
     "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
     "var/Makefile") CONFIG_FILES="$CONFIG_FILES var/Makefile" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
   esac
 done
 
@@ -13344,7 +13411,7 @@
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -13361,7 +13428,7 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -13375,18 +13442,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -13408,7 +13475,7 @@
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -13422,7 +13489,7 @@
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
@@ -13475,20 +13542,28 @@
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -13516,7 +13591,7 @@
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -13601,7 +13676,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -13614,7 +13689,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -13642,7 +13717,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -13669,7 +13744,7 @@
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
     esac
     ;;
   esac
@@ -13806,22 +13881,22 @@
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -13832,19 +13907,19 @@
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -14629,7 +14704,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -14650,7 +14725,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

=== modified file 'configure.ac'
--- configure.ac	2010-08-16 19:45:48 +0000
+++ configure.ac	2011-09-06 14:51:24 +0000
@@ -259,6 +259,12 @@
     fi
 fi
 
+has_crypto=`${ERL} -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop`
+
+if test -n "$has_crypto"; then
+    AC_MSG_ERROR([Could not find the Erlang crypto library. Has Erlang been compiled with OpenSSL support?])
+fi
+
 AC_PATH_PROG([ERLC], [erlc])
 
 if test x${ERLC} = x; then

=== removed file 'debian/binary.lintian-overrides'
--- debian/binary.lintian-overrides	2009-12-28 22:37:56 +0000
+++ debian/binary.lintian-overrides	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-couchdb-bin: virtual-package-depends-without-real-package-depends

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-14 17:47:09 +0000
+++ debian/changelog	2011-09-06 14:51:24 +0000
@@ -1,3 +1,45 @@
+couchdb (1.1.0-1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable.
+  * Fixed a regression in the latest debian version
+    - See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635762
+  * Ubuntu changes still remaining:
+    - moz000*.patch: Build against spidermonkey 1.8.5:
+    - init.patch: Improved init script
+    - fix-help2man.patch: Build with newer versions of help2man
+  * Removed superceded patches:
+    - couchio-fix-0001-replicator_redirect_atts.patch
+    - couchio-fix-0002-replicator_db_proxy_fix.patch
+    - couchio-fix-0003-changes_redirect_1.patch
+    - couchio-fix-0004-changes_redirect_2.patch
+    - couchio-fix-0005-changes_proxy.patch
+    - couchio-fix-0006-replicator_reader_errors.patch
+    - couchio-fix-0007-ibrowse_upgrade.patch
+    - couchio-fix-0008-replicator_doc_id_encoding.patch
+    - couchio-fix-0009-replicator_changes_error.patch
+    - couchio-fix-0010-replicator_changes_connection_close.patch
+    - couchio-fix-0011-ibrowse_chunked_encoding_streaming.patch
+    - couchio-fix-0012-replicator_ssl.patch
+    - jquery15-fix.patch
+  * Rebuilt debian/patches/moz0003-spidermonkey1.8.5_autotools.patch
+    
+ -- Mat Scales <[e-mail]>  Mon, 05 Sep 2011 22:28:39 +0100
+
+couchdb (1.1.0-1) unstable; urgency=low
+
+  * New upstream release (closes: #590334).
+  * Version jQuery dependency (closes: #582022, #614941).
+  * Empty dependency_libs in *.la (closes: #621202).
+  * Drop pid.patch , applied upstream and drop icu-config.patch not needed.
+  * Fix postrm , remove_file_collection is missing.
+  * Fix several lintian errors and warnings:
+    - add patch to implement force-reload initscript option
+    - use real erlang dependency, not just the virtual ABI one
+    - remove embedded jquery.form.js , depend on its package
+    - remove var/run/couchdb from the package, it'll be created on demand
+
+ -- Laszlo Boszormenyi (GCS) <[e-mail]>  Thu, 14 Apr 2011 11:56:01 +0200
+
 couchdb (1.0.1-0ubuntu16) oneiric; urgency=low
 
   * Update Spidermonkey 1.8.5 patchset to the more palatable ones I'm

=== modified file 'debian/control'
--- debian/control	2011-03-24 01:02:03 +0000
+++ debian/control	2011-09-06 14:51:24 +0000
@@ -2,20 +2,37 @@
 Section: misc
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Erlang Packaging Team <[e-mail]>
-Uploaders: Sergei Golovan <[e-mail]>, Sam Bisbee <[e-mail]>, Elliot Murphy <[e-mail]>
-Standards-Version: 3.9.1
-Build-Depends: cdbs (>= 0.4.42), debhelper (>= 7.2.11),
- erlang-dev (>= 1:13.b.1-dfsg-3), help2man (>= 1.37), libcurl4-openssl-dev,
- libicu-dev, libreadline-dev,
- libmozjs185-dev, erlang-crypto, erlang-inets, erlang-xmerl
+XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) <[e-mail]>
+Standards-Version: 3.9.2
+Build-Depends: cdbs (>= 0.4.42),
+               debhelper (>= 7.2.11),
+               erlang-crypto,
+               erlang-dev (>= 1:13.b.1-dfsg-3),
+               erlang-eunit,
+               erlang-inets,
+               erlang-xmerl,
+               help2man (>= 1.37),
+               libcurl4-openssl-dev,
+               libicu-dev,
+               libmozjs185-dev,
+               libreadline-dev
 Homepage: http://couchdb.apache.org/
-Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-erlang/couchdb
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-erlang/couchdb
 
 Package: couchdb-bin
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${erlang-base:Depends},
- ${erlang-crypto:Depends}, ${erlang-inets:Depends}, ${erlang-xmerl:Depends}, ${erlang-abi:Depends}, ${shlibs:Depends}, ${misc:Depends}, adduser, libjs-jquery, lsb-base, procps, mawk
+Depends: adduser,
+         libjs-jquery (>= 1.4.2),
+         libjs-jquery-form (>= 2.36),
+         lsb-base,
+         mawk,
+         procps,
+         erlang-base-hipe | erlang-base | ${erlang-abi:Depends},
+         ${erlang-base:Depends},
+         ${erlang-crypto:Depends},
+         ${erlang-eunit:Depends},
+         ${erlang-inets:Depends},
+         ${erlang-xmerl:Depends},
+         ${misc:Depends},
+         ${shlibs:Depends}
 Suggests: couchdb
 Architecture: any
 Description: RESTful document oriented database, programs

=== modified file 'debian/couchdb-bin.dirs'
--- debian/couchdb-bin.dirs	2009-09-25 19:18:26 +0000
+++ debian/couchdb-bin.dirs	2011-09-06 14:51:24 +0000
@@ -1,3 +1,2 @@
 etc/couchdb/default.d
 etc/couchdb/local.d
-usr/share/lintian/overrides

=== removed file 'debian/patches/couchio-fix-0001-replicator_redirect_atts.patch'
--- debian/patches/couchio-fix-0001-replicator_redirect_atts.patch	2010-09-24 14:53:26 +0000
+++ debian/patches/couchio-fix-0001-replicator_redirect_atts.patch	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-diff --git a/couchdb-1.0.1/src/couchdb/couch_rep_att.erl b/couchdb-1.0.1/src/couchdb/couch_rep_att.erl
-index 28b8945..3c09b90 100644
---- a/couchdb-1.0.1/src/couchdb/couch_rep_att.erl
-+++ b/couchdb-1.0.1/src/couchdb/couch_rep_att.erl
-@@ -106,7 +106,7 @@ validate_headers(_Req, 200, Headers) ->
-     MochiHeaders = mochiweb_headers:make(Headers),
-     {ok, mochiweb_headers:get_value("Content-Encoding", MochiHeaders)};
- validate_headers(Req, Code, Headers) when Code > 299, Code < 400 ->
--    Url = mochiweb_headers:get_value("Location",mochiweb_headers:make(Headers)),
-+    Url = couch_rep_httpc:redirect_url(Headers, Req#http_db.url),
-     NewReq = couch_rep_httpc:redirected_request(Req, Url),
-     {ibrowse_req_id, ReqId} = couch_rep_httpc:request(NewReq),
-     receive {ibrowse_async_headers, ReqId, NewCode, NewHeaders} ->
-diff --git a/couchdb-1.0.1/src/couchdb/couch_rep_httpc.erl b/couchdb-1.0.1/src/couchdb/couch_rep_httpc.erl
-index 768d88a..ff25e4d 100644
---- a/couchdb-1.0.1/src/couchdb/couch_rep_httpc.erl
-+++ b/couchdb-1.0.1/src/couchdb/couch_rep_httpc.erl
-@@ -15,7 +15,7 @@
- -include("../ibrowse/ibrowse.hrl").
- 
- -export([db_exists/1, db_exists/2, full_url/1, request/1, redirected_request/2,
--    spawn_worker_process/1, spawn_link_worker_process/1]).
-+    redirect_url/2, spawn_worker_process/1, spawn_link_worker_process/1]).
- 
- request(#http_db{} = Req) ->
-     do_request(Req).

=== removed file 'debian/patches/couchio-fix-0002-replicator_db_proxy_fix.patch'
--- debian/patches/couchio-fix-0002-replicator_db_proxy_fix.patch	2010-09-24 14:53:26 +0000
+++ debian/patches/couchio-fix-0002-replicator_db_proxy_fix.patch	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-diff --git a/couchdb-1.0.1/src/couchdb/couch_rep_httpc.erl b/couchdb-1.0.1/src/couchdb/couch_rep_httpc.erl
-index 1336575..2371228 100644
---- a/couchdb-1.0.1/src/couchdb/couch_rep_httpc.erl
-+++ b/couchdb-1.0.1/src/couchdb/couch_rep_httpc.erl
-@@ -73,6 +73,7 @@ db_exists(Req, CanonicalUrl, CreateDB) ->
-     #http_db{
-         auth = Auth,
-         headers = Headers0,
-+        options = Options,
-         url = Url
-     } = Req,
-     HeadersFun = fun(Method) ->
-@@ -85,10 +86,10 @@ db_exists(Req, CanonicalUrl, CreateDB) ->
-     end,
-     case CreateDB of
-         true ->
--            catch ibrowse:send_req(Url, HeadersFun(put), put);
-+            catch ibrowse:send_req(Url, HeadersFun(put), put, [], Options);
-         _Else -> ok
-     end,
--    case catch ibrowse:send_req(Url, HeadersFun(head), head) of
-+    case catch ibrowse:send_req(Url, HeadersFun(head), head, [], Options) of
-     {ok, "200", _, _} ->
-         Req#http_db{url = CanonicalUrl};
-     {ok, "301", RespHeaders, _} ->

=== removed file 'debian/patches/couchio-fix-0003-changes_redirect_1.patch'
--- debian/patches/couchio-fix-0003-changes_redirect_1.patch	2010-09-24 14:53:26 +0000
+++ debian/patches/couchio-fix-0003-changes_redirect_1.patch	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-diff --git a/couchdb-1.0.1/src/couchdb/couch_rep_changes_feed.erl b/couchdb-1.0.1/src/couchdb/couch_rep_changes_feed.erl
-index 1682d37..65a67ba 100644
---- a/couchdb-1.0.1/src/couchdb/couch_rep_changes_feed.erl
-+++ b/couchdb-1.0.1/src/couchdb/couch_rep_changes_feed.erl
-@@ -95,7 +95,7 @@ init([_Parent, #http_db{}=Source, Since, PostProps] = Args) ->
-         {ok, #state{conn=Pid, last_seq=Since, reqid=ReqId, init_args=Args}};
-     {ibrowse_async_headers, ReqId, Code, Hdrs} when Code=="301"; Code=="302" ->
-         catch ibrowse:stop_worker_process(Pid),
--        Url2 = mochiweb_headers:get_value("Location", mochiweb_headers:make(Hdrs)),
-+        Url2 = couch_rep_httpc:redirect_url(Hdrs, Req#http_db.url),
-         %% TODO use couch_httpc:request instead of start_http_request
-         {Pid2, ReqId2} = start_http_request(Url2),
-         receive {ibrowse_async_headers, ReqId2, "200", _} ->

=== removed file 'debian/patches/couchio-fix-0004-changes_redirect_2.patch'
--- debian/patches/couchio-fix-0004-changes_redirect_2.patch	2010-09-24 14:53:26 +0000
+++ debian/patches/couchio-fix-0004-changes_redirect_2.patch	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-diff --git a/couchdb-1.0.1/src/couchdb/couch_rep_changes_feed.erl b/couchdb-1.0.1/src/couchdb/couch_rep_changes_feed.erl
-index 65a67ba..2d55778 100644
---- a/couchdb-1.0.1/src/couchdb/couch_rep_changes_feed.erl
-+++ b/couchdb-1.0.1/src/couchdb/couch_rep_changes_feed.erl
-@@ -258,9 +258,10 @@ handle_next_changes(_From, State) ->
- handle_headers(200, _, State) ->
-     maybe_stream_next(State),
-     {noreply, State};
--handle_headers(301, Hdrs, State) ->
-+handle_headers(301, Hdrs, #state{init_args = InitArgs} = State) ->
-     catch ibrowse:stop_worker_process(State#state.conn),
--    Url = mochiweb_headers:get_value("Location", mochiweb_headers:make(Hdrs)),
-+    [_, #http_db{url = Url1} | _] = InitArgs,
-+    Url = couch_rep_httpc:redirect_url(Hdrs, Url1),
-     %% TODO use couch_httpc:request instead of start_http_request
-     {Pid, ReqId} = start_http_request(Url),
-     {noreply, State#state{conn=Pid, reqid=ReqId}};

=== removed file 'debian/patches/couchio-fix-0005-changes_proxy.patch'
--- debian/patches/couchio-fix-0005-changes_proxy.patch	2010-09-24 14:53:26 +0000
+++ debian/patches/couchio-fix-0005-changes_proxy.patch	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-diff --git a/couchdb-1.0.1/src/couchdb/couch_rep_changes_feed.erl b/couchdb-1.0.1/src/couchdb/couch_rep_changes_feed.erl
-index 2d55778..958ee82 100644
---- a/couchdb-1.0.1/src/couchdb/couch_rep_changes_feed.erl
-+++ b/couchdb-1.0.1/src/couchdb/couch_rep_changes_feed.erl
-@@ -45,7 +45,7 @@ next(Server) ->
- stop(Server) ->
-     gen_server:call(Server, stop).
- 
--init([_Parent, #http_db{}=Source, Since, PostProps] = Args) ->
-+init([Parent, #http_db{}=Source, Since, PostProps]) ->
-     process_flag(trap_exit, true),
-     Feed = case couch_util:get_value(<<"continuous">>, PostProps, false) of
-     false ->
-@@ -88,6 +88,7 @@ init([_Parent, #http_db{}=Source, Since, PostProps] = Args) ->
-         headers = Source#http_db.headers -- [{"Accept-Encoding", "gzip"}]
-     },
-     {ibrowse_req_id, ReqId} = couch_rep_httpc:request(Req),
-+    Args = [Parent, Req, Since, PostProps],
- 
-     receive
-     {ibrowse_async_headers, ReqId, "200", _} ->
-@@ -96,10 +97,13 @@ init([_Parent, #http_db{}=Source, Since, PostProps] = Args) ->
-     {ibrowse_async_headers, ReqId, Code, Hdrs} when Code=="301"; Code=="302" ->
-         catch ibrowse:stop_worker_process(Pid),
-         Url2 = couch_rep_httpc:redirect_url(Hdrs, Req#http_db.url),
--        %% TODO use couch_httpc:request instead of start_http_request
--        {Pid2, ReqId2} = start_http_request(Url2),
-+        Req2 = couch_rep_httpc:redirected_request(Req, Url2),
-+        Pid2 = couch_rep_httpc:spawn_link_worker_process(Req2),
-+        Req3 = Req2#http_db{conn = Pid2},
-+        {ibrowse_req_id, ReqId2} = couch_rep_httpc:request(Req3),
-+        Args2 = [Parent, Req3, Since, PostProps],
-         receive {ibrowse_async_headers, ReqId2, "200", _} ->
--            {ok, #state{conn=Pid2, last_seq=Since, reqid=ReqId2, init_args=Args}}
-+            {ok, #state{conn=Pid2, last_seq=Since, reqid=ReqId2, init_args=Args2}}
-         after 30000 ->
-             {stop, changes_timeout}
-         end;
-@@ -258,13 +262,17 @@ handle_next_changes(_From, State) ->
- handle_headers(200, _, State) ->
-     maybe_stream_next(State),
-     {noreply, State};
--handle_headers(301, Hdrs, #state{init_args = InitArgs} = State) ->
-+handle_headers(Code, Hdrs, #state{init_args = InitArgs} = State)
-+        when Code =:= 301 ; Code =:= 302 ->
-     catch ibrowse:stop_worker_process(State#state.conn),
--    [_, #http_db{url = Url1} | _] = InitArgs,
-+    [Parent, #http_db{url = Url1} = Source, Since, PostProps] = InitArgs,
-     Url = couch_rep_httpc:redirect_url(Hdrs, Url1),
--    %% TODO use couch_httpc:request instead of start_http_request
--    {Pid, ReqId} = start_http_request(Url),
--    {noreply, State#state{conn=Pid, reqid=ReqId}};
-+    Source2 = couch_rep_httpc:redirected_request(Source, Url),
-+    Pid2 = couch_rep_httpc:spawn_link_worker_process(Source2),
-+    Source3 = Source2#http_db{conn = Pid2},
-+    {ibrowse_req_id, ReqId} = couch_rep_httpc:request(Source3),
-+    InitArgs2 = [Parent, Source3, Since, PostProps],
-+    {noreply, State#state{conn=Pid2, reqid=ReqId, init_args=InitArgs2}};
- handle_headers(Code, Hdrs, State) ->
-     ?LOG_ERROR("replicator changes feed failed with code ~s and Headers ~n~p",
-         [Code,Hdrs]),
-@@ -374,15 +382,3 @@ maybe_stream_next(#state{complete=false, count=N} = S) when N < ?BUFFER_SIZE ->
-     ibrowse:stream_next(S#state.reqid);
- maybe_stream_next(_) ->
-     timer:cancel(get(timeout)).
--
--start_http_request(RawUrl) ->
--    Url = ibrowse_lib:parse_url(RawUrl),
--    {ok, Pid} = ibrowse:spawn_link_worker_process(Url#url.host, Url#url.port),
--    Opts = [
--        {stream_to, {self(), once}},
--        {inactivity_timeout, 31000},
--        {response_format, binary}
--    ],
--    {ibrowse_req_id, Id} =
--        ibrowse:send_req_direct(Pid, RawUrl, [], get, [], Opts, infinity),
--    {Pid, Id}.

=== removed file 'debian/patches/couchio-fix-0006-replicator_reader_errors.patch'
--- debian/patches/couchio-fix-0006-replicator_reader_errors.patch	2010-09-24 14:53:26 +0000
+++ debian/patches/couchio-fix-0006-replicator_reader_errors.patch	1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-diff --git a/couchdb-1.0.1/src/couchdb/couch_httpd_misc_handlers.erl b/couchdb-1.0.1/src/couchdb/couch_httpd_misc_handlers.erl
-index 0a6f4a4..13d770f 100644
---- a/couchdb-1.0.1/src/couchdb/couch_httpd_misc_handlers.erl
-+++ b/couchdb-1.0.1/src/couchdb/couch_httpd_misc_handlers.erl
-@@ -93,7 +93,12 @@ handle_replicate_req(#httpd{method='POST'}=Req) ->
-     {error, not_found} ->
-         send_json(Req, 404, {[{error, not_found}]});
-     {error, Reason} ->
--        send_json(Req, 500, {[{error, Reason}]})
-+        try
-+            send_json(Req, 500, {[{error, Reason}]})
-+        catch
-+        exit:{json_encode, _} ->
-+            send_json(Req, 500, {[{error, couch_util:to_binary(Reason)}]})
-+        end
-     catch
-     throw:{db_not_found, Msg} ->
-         send_json(Req, 404, {[{error, db_not_found}, {reason, Msg}]})
-diff --git a/couchdb-1.0.1/src/couchdb/couch_rep.erl b/couchdb-1.0.1/src/couchdb/couch_rep.erl
-index ae42e0e..404b1fd 100644
---- a/couchdb-1.0.1/src/couchdb/couch_rep.erl
-+++ b/couchdb-1.0.1/src/couchdb/couch_rep.erl
-@@ -354,16 +354,10 @@ close_db(Db) ->
-     couch_db:close(Db).
- 
- dbname(#http_db{url = Url}) ->
--    strip_password(Url);
-+    couch_util:url_strip_password(Url);
- dbname(#db{name = Name}) ->
-     Name.
- 
--strip_password(Url) ->
--    re:replace(Url,
--        "http(s)?://([^:]+):[^@]+@(.*)$",
--        "http\\1://\\2:*****@\\3",
--        [{return, list}]).
--
- dbinfo(#http_db{} = Db) ->
-     {DbProps} = couch_rep_httpc:request(Db),
-     [{list_to_existing_atom(?b2l(K)), V} || {K,V} <- DbProps];
-diff --git a/couchdb-1.0.1/src/couchdb/couch_rep_reader.erl b/couchdb-1.0.1/src/couchdb/couch_rep_reader.erl
-index 3edc1f3..5c824cb 100644
---- a/couchdb-1.0.1/src/couchdb/couch_rep_reader.erl
-+++ b/couchdb-1.0.1/src/couchdb/couch_rep_reader.erl
-@@ -230,7 +230,7 @@ update_sequence_lists(Seq, State) ->
-         opened_seqs = Opened
-     }.
- 
--open_doc_revs(#http_db{} = DbS, DocId, Revs) ->
-+open_doc_revs(#http_db{url = Url} = DbS, DocId, Revs) ->
-     %% all this logic just splits up revision lists that are too long for
-     %% MochiWeb into multiple requests
-     BaseQS = [{revs,true}, {latest,true}, {att_encoding_info,true}],
-@@ -246,28 +246,39 @@ open_doc_revs(#http_db{} = DbS, DocId, Revs) ->
-     JsonResults = lists:flatten([couch_rep_httpc:request(R) || R <- Requests]),
- 
-     Transform =
--    fun({[{<<"missing">>, Rev}]}) ->
--        {{not_found, missing}, couch_doc:parse_rev(Rev)};
--    ({[{<<"ok">>, Json}]}) ->
-+    fun({[{<<"ok">>, Json}]}, Acc) ->
-         #doc{id=Id, revs=Rev, atts=Atts} = Doc = couch_doc:from_json_obj(Json),
--        Doc#doc{atts=[couch_rep_att:convert_stub(A, {DbS,Id,Rev}) || A <- Atts]}
-+        Doc1 = Doc#doc{
-+            atts=[couch_rep_att:convert_stub(A, {DbS,Id,Rev}) || A <- Atts]
-+        },
-+        [Doc1 | Acc];
-+    ({ErrorProps}, Acc) ->
-+        Err = couch_util:get_value(<<"error">>, ErrorProps,
-+            ?JSON_ENCODE({ErrorProps})),
-+        ?LOG_ERROR("Replicator: error accessing doc ~s at ~s, reason: ~s",
-+           [DocId, couch_util:url_strip_password(Url), Err]),
-+        Acc
-     end,
--    [Transform(Result) || Result <- JsonResults].
-+    lists:reverse(lists:foldl(Transform, [], JsonResults)).
- 
--open_doc(#http_db{} = DbS, DocId) ->
-+open_doc(#http_db{url = Url} = DbS, DocId) ->
-     % get latest rev of the doc
-     Req = DbS#http_db{
-         resource=url_encode(DocId),
-         qs=[{att_encoding_info, true}]
-     },
--    case couch_rep_httpc:request(Req) of
--    {[{<<"error">>,<<"not_found">>}, {<<"reason">>,<<"missing">>}]} ->
--        [];
--    Json ->
-+    {Props} = Json = couch_rep_httpc:request(Req),
-+    case couch_util:get_value(<<"_id">>, Props) of
-+    Id when is_binary(Id) ->
-         #doc{id=Id, revs=Rev, atts=Atts} = Doc = couch_doc:from_json_obj(Json),
-         [Doc#doc{
-             atts=[couch_rep_att:convert_stub(A, {DbS,Id,Rev}) || A <- Atts]
--        }]
-+        }];
-+    undefined ->
-+        Err = couch_util:get_value(<<"error">>, Props, ?JSON_ENCODE(Json)),
-+        ?LOG_ERROR("Replicator: error accessing doc ~s at ~s, reason: ~s",
-+            [DocId, couch_util:url_strip_password(Url), Err]),
-+        []
-     end.
- 
- reader_loop(ReaderServer, Source, DocIds) when is_list(DocIds) ->
-diff --git a/couchdb-1.0.1/src/couchdb/couch_util.erl b/couchdb-1.0.1/src/couchdb/couch_util.erl
-index 8217a26..7a8ae05 100644
---- a/couchdb-1.0.1/src/couchdb/couch_util.erl
-+++ b/couchdb-1.0.1/src/couchdb/couch_util.erl
-@@ -27,6 +27,7 @@
- -export([get_value/2, get_value/3]).
- -export([md5/1, md5_init/0, md5_update/2, md5_final/1]).
- -export([reorder_results/2]).
-+-export([url_strip_password/1]).
- 
- -include("couch_db.hrl").
- -include_lib("kernel/include/file.hrl").
-@@ -452,3 +453,9 @@ reorder_results(Keys, SortedResults) when length(Keys) < 100 ->
- reorder_results(Keys, SortedResults) ->
-     KeyDict = dict:from_list(SortedResults),
-     [dict:fetch(Key, KeyDict) || Key <- Keys].
-+
-+url_strip_password(Url) ->
-+    re:replace(Url,
-+        "http(s)?://([^:]+):[^@]+@(.*)$",
-+        "http\\1://\\2:*****@\\3",
-+        [{return, list}]).

=== removed file 'debian/patches/couchio-fix-0007-ibrowse_upgrade.patch'
--- debian/patches/couchio-fix-0007-ibrowse_upgrade.patch	2010-09-24 14:53:26 +0000
+++ debian/patches/couchio-fix-0007-ibrowse_upgrade.patch	1970-01-01 00:00:00 +0000
@@ -1,3481 +0,0 @@
-diff --git a/couchdb-1.0.1/src/couchdb/couch_rep_httpc.erl b/couchdb-1.0.1/src/couchdb/couch_rep_httpc.erl
-index 2371228..74aa52a 100644
---- a/couchdb-1.0.1/src/couchdb/couch_rep_httpc.erl
-+++ b/couchdb-1.0.1/src/couchdb/couch_rep_httpc.erl
-@@ -205,8 +205,7 @@ spawn_worker_process(Req) ->
-     Pid.
- 
- spawn_link_worker_process(Req) ->
--    Url = ibrowse_lib:parse_url(Req#http_db.url),
--    {ok, Pid} = ibrowse_http_client:start_link(Url),
-+    {ok, Pid} = ibrowse:spawn_link_worker_process(Req#http_db.url),
-     Pid.
- 
- maybe_decompress(Headers, Body) ->
-diff --git a/couchdb-1.0.1/src/ibrowse/ibrowse.app.in b/couchdb-1.0.1/src/ibrowse/ibrowse.app.in
-index 4f43dd9..208c311 100644
---- a/couchdb-1.0.1/src/ibrowse/ibrowse.app.in
-+++ b/couchdb-1.0.1/src/ibrowse/ibrowse.app.in
-@@ -1,10 +1,10 @@
- {application, ibrowse,
-         [{description, "HTTP client application"},
--         {vsn, "1.5.1"},
--         {modules, [ ibrowse,
--		     ibrowse_http_client,
--		     ibrowse_app,
--		     ibrowse_sup,
-+         {vsn, "1.6.2"},
-+         {modules, [ ibrowse, 
-+		     ibrowse_http_client, 
-+		     ibrowse_app, 
-+		     ibrowse_sup, 
- 		     ibrowse_lib,
- 		     ibrowse_lb ]},
-          {registered, []},
-diff --git a/couchdb-1.0.1/src/ibrowse/ibrowse.erl b/couchdb-1.0.1/src/ibrowse/ibrowse.erl
-index 1913ef5..09d36a3 100644
---- a/couchdb-1.0.1/src/ibrowse/ibrowse.erl
-+++ b/couchdb-1.0.1/src/ibrowse/ibrowse.erl
-@@ -6,8 +6,8 @@
- %%% Created : 11 Oct 2003 by Chandrashekhar Mullaparthi <[e-mail]>
- %%%-------------------------------------------------------------------
- %% @author Chandrashekhar Mullaparthi <chandrashekhar dot mullaparthi at gmail dot com>
--%% @copyright 2005-2009 Chandrashekhar Mullaparthi
--%% @version 1.5.2
-+%% @copyright 2005-2010 Chandrashekhar Mullaparthi
-+%% @version 1.6.0
- %% @doc The ibrowse application implements an HTTP 1.1 client. This
- %% module implements the API of the HTTP client. There is one named
- %% process called 'ibrowse' which assists in load balancing and maintaining configuration. There is one load balancing process per unique webserver. There is
-@@ -21,22 +21,22 @@
- %% <p>Here are a few sample invocations.</p>
- %%
- %% <code>
--%% ibrowse:send_req("http://intranet/messenger/", [], get).
-+%% ibrowse:send_req("http://intranet/messenger/", [], get). 
- %% <br/><br/>
--%%
--%% ibrowse:send_req("http://www.google.com/", [], get, [],
--%% 		 [{proxy_user, "XXXXX"},
--%% 		  {proxy_password, "XXXXX"},
--%% 		  {proxy_host, "proxy"},
--%% 		  {proxy_port, 8080}], 1000).
-+%% 
-+%% ibrowse:send_req("http://www.google.com/", [], get, [], 
-+%%               [{proxy_user, "XXXXX"},
-+%%                {proxy_password, "XXXXX"},
-+%%                {proxy_host, "proxy"},
-+%%                {proxy_port, 8080}], 1000). 
- %% <br/><br/>
- %%
- %%ibrowse:send_req("http://www.erlang.org/download/otp_src_R10B-3.tar.gz", [], get, [],
--%% 		 [{proxy_user, "XXXXX"},
--%% 		  {proxy_password, "XXXXX"},
--%% 		  {proxy_host, "proxy"},
--%% 		  {proxy_port, 8080},
--%% 		  {save_response_to_file, true}], 1000).
-+%%               [{proxy_user, "XXXXX"},
-+%%                {proxy_password, "XXXXX"},
-+%%                {proxy_host, "proxy"},
-+%%                {proxy_port, 8080},
-+%%                {save_response_to_file, true}], 1000).
- %% <br/><br/>
- %%
- %% ibrowse:send_req("http://www.erlang.org", [], head).
-@@ -48,17 +48,12 @@
- %% ibrowse:send_req("http://www.bbc.co.uk", [], trace).
- %%
- %% <br/><br/>
--%% ibrowse:send_req("http://www.google.com", [], get, [],
-+%% ibrowse:send_req("http://www.google.com", [], get, [], 
- %%                   [{stream_to, self()}]).
- %% </code>
- %%
--%% <p>A driver exists which implements URL encoding in C, but the
--%% speed achieved using only erlang has been good enough, so the
--%% driver isn't actually used.</p>
- 
- -module(ibrowse).
---vsn('$Id: ibrowse.erl,v 1.8 2009/07/01 22:43:19 chandrusf Exp $ ').
--
- -behaviour(gen_server).
- %%--------------------------------------------------------------------
- %% Include files
-@@ -70,48 +65,50 @@
- 
- %% gen_server callbacks
- -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
--	 terminate/2, code_change/3]).
-+         terminate/2, code_change/3]).
- 
- %% API interface
- -export([
--	 rescan_config/0,
--	 rescan_config/1,
--	 get_config_value/1,
--	 get_config_value/2,
--	 spawn_worker_process/2,
--	 spawn_link_worker_process/2,
--	 stop_worker_process/1,
--	 send_req/3,
--	 send_req/4,
--	 send_req/5,
--	 send_req/6,
--	 send_req_direct/4,
--	 send_req_direct/5,
--	 send_req_direct/6,
--	 send_req_direct/7,
--	 stream_next/1,
--	 set_max_sessions/3,
--	 set_max_pipeline_size/3,
--	 set_dest/3,
--	 trace_on/0,
--	 trace_off/0,
--	 trace_on/2,
--	 trace_off/2,
--	 all_trace_off/0,
--	 show_dest_status/0,
--	 show_dest_status/2
--	]).
-+         rescan_config/0,
-+         rescan_config/1,
-+         get_config_value/1,
-+         get_config_value/2,
-+         spawn_worker_process/1,
-+         spawn_worker_process/2,
-+         spawn_link_worker_process/1,
-+         spawn_link_worker_process/2,
-+         stop_worker_process/1,
-+         send_req/3,
-+         send_req/4,
-+         send_req/5,
-+         send_req/6,
-+         send_req_direct/4,
-+         send_req_direct/5,
-+         send_req_direct/6,
-+         send_req_direct/7,
-+         stream_next/1,
-+         set_max_sessions/3,
-+         set_max_pipeline_size/3,
-+         set_dest/3,
-+         trace_on/0,
-+         trace_off/0,
-+         trace_on/2,
-+         trace_off/2,
-+         all_trace_off/0,
-+         show_dest_status/0,
-+         show_dest_status/2
-+        ]).
- 
- -ifdef(debug).
- -compile(export_all).
- -endif.
- 
- -import(ibrowse_lib, [
--		      parse_url/1,
--		      get_value/3,
--		      do_trace/2
--		     ]).
--
-+                      parse_url/1,
-+                      get_value/3,
-+                      do_trace/2
-+                     ]).
-+                      
- -record(state, {trace = false}).
- 
- -include("ibrowse.hrl").
-@@ -159,7 +156,7 @@ stop() ->
- send_req(Url, Headers, Method) ->
-     send_req(Url, Headers, Method, [], []).
- 
--%% @doc Same as send_req/3.
-+%% @doc Same as send_req/3. 
- %% If a list is specified for the body it has to be a flat list. The body can also be a fun/0 or a fun/1. <br/>
- %% If fun/0, the connection handling process will repeatdely call the fun until it returns an error or eof. <pre>Fun() = {ok, Data} | eof</pre><br/>
- %% If fun/1, the connection handling process will repeatedly call the fun with the supplied state until it returns an error or eof. <pre>Fun(State) = {ok, Data} | {ok, Data, NewState} | eof</pre>
-@@ -169,19 +166,19 @@ send_req(Url, Headers, Method) ->
- send_req(Url, Headers, Method, Body) ->
-     send_req(Url, Headers, Method, Body, []).
- 
--%% @doc Same as send_req/4.
-+%% @doc Same as send_req/4. 
- %% For a description of SSL Options, look in the <a href="http://www.erlang.org/doc/apps/ssl/index.html">ssl</a> manpage. If the
- %% HTTP Version to use is not specified, the default is 1.1.
- %% <br/>
--%% <p>The <code>host_header</code> option is useful in the case where ibrowse is
-+%% <ul>
-+%% <li>The <code>host_header</code> option is useful in the case where ibrowse is
- %% connecting to a component such as <a
- %% href="http://www.stunnel.org">stunnel</a> which then sets up a
- %% secure connection to a webserver. In this case, the URL supplied to
- %% ibrowse must have the stunnel host/port details, but that won't
- %% make sense to the destination webserver. This option can then be
- %% used to specify what should go in the <code>Host</code> header in
--%% the request.</p>
--%% <ul>
-+%% the request.</li>
- %% <li>The <code>stream_to</code> option can be used to have the HTTP
- %% response streamed to a process as messages as data arrives on the
- %% socket. If the calling process wishes to control the rate at which
-@@ -220,12 +217,25 @@ send_req(Url, Headers, Method, Body) ->
- %% ibrowse:send_req("http://www.example.com/cgi-bin/request", [], get, [], [{connect_timeout, 100}], 1000).
- %% </code>
- %% In the above invocation, if the connection isn't established within
--%% 100 milliseconds, the request will fail with
-+%% 100 milliseconds, the request will fail with 
- %% <code>{error, conn_failed}</code>.<br/>
- %% If connection setup succeeds, the total time allowed for the
- %% request to complete will be 1000 milliseconds minus the time taken
- %% for connection setup.
- %% </li>
-+%% 
-+%% <li> The <code>socket_options</code> option can be used to set
-+%% specific options on the socket. The <code>{active, true | false | once}</code> 
-+%% and <code>{packet_type, Packet_type}</code> will be filtered out by ibrowse.  </li>
-+%%
-+%% <li> The <code>headers_as_is</code> option is to enable the caller
-+%% to send headers exactly as specified in the request without ibrowse
-+%% adding some of its own. Required for some picky servers apparently.  </li>
-+%%
-+%% <li>The <code>give_raw_headers</code> option is to enable the
-+%% caller to get access to the raw status line and raw unparsed
-+%% headers. Not quite sure why someone would want this, but one of my
-+%% users asked for it, so here it is. </li>
- %% </ul>
- %%
- %% @spec send_req(Url::string(), Headers::headerList(), Method::method(), Body::body(), Options::optionList()) -> response()
-@@ -234,7 +244,7 @@ send_req(Url, Headers, Method, Body) ->
- %%          {response_format,response_format()}|
- %%          {stream_chunk_size, integer()}     |
- %%          {max_pipeline_size, integer()}     |
--%%          {trace, boolean()}                 |
-+%%          {trace, boolean()}                 | 
- %%          {is_ssl, boolean()}                |
- %%          {ssl_options, [SSLOpt]}            |
- %%          {pool_name, atom()}                |
-@@ -253,13 +263,18 @@ send_req(Url, Headers, Method, Body) ->
- %%          {host_header, string()}            |
- %%          {inactivity_timeout, integer()}    |
- %%          {connect_timeout, integer()}       |
--%%          {transfer_encoding, {chunked, ChunkSize}}
-+%%          {socket_options, Sock_opts}        |
-+%%          {transfer_encoding, {chunked, ChunkSize}} | 
-+%%          {headers_as_is, boolean()}         |
-+%%          {give_raw_headers, boolean()}
- %%
- %% stream_to() = process() | {process(), once}
- %% process() = pid() | atom()
- %% username() = string()
- %% password() = string()
- %% SSLOpt = term()
-+%% Sock_opts = [Sock_opt]
-+%% Sock_opt = term()
- %% ChunkSize = integer()
- %% srtf() = boolean() | filename()
- %% filename() = string()
-@@ -267,54 +282,54 @@ send_req(Url, Headers, Method, Body) ->
- send_req(Url, Headers, Method, Body, Options) ->
-     send_req(Url, Headers, Method, Body, Options, 30000).
- 
--%% @doc Same as send_req/5.
-+%% @doc Same as send_req/5. 
- %% All timeout values are in milliseconds.
- %% @spec send_req(Url, Headers::headerList(), Method::method(), Body::body(), Options::optionList(), Timeout) -> response()
- %% Timeout = integer() | infinity
- send_req(Url, Headers, Method, Body, Options, Timeout) ->
-     case catch parse_url(Url) of
--	#url{host = Host,
--	     port = Port,
--	     protocol = Protocol} = Parsed_url ->
--	    Lb_pid = case ets:lookup(ibrowse_lb, {Host, Port}) of
--			 [] ->
--			     get_lb_pid(Parsed_url);
--			 [#lb_pid{pid = Lb_pid_1}] ->
--			     Lb_pid_1
--		     end,
--	    Max_sessions = get_max_sessions(Host, Port, Options),
--	    Max_pipeline_size = get_max_pipeline_size(Host, Port, Options),
--	    Options_1 = merge_options(Host, Port, Options),
--	    {SSLOptions, IsSSL} =
--		case (Protocol == https) orelse
--		     get_value(is_ssl, Options_1, false) of
--		    false -> {[], false};
--		    true -> {get_value(ssl_options, Options_1, []), true}
--		end,
--	    case ibrowse_lb:spawn_connection(Lb_pid, Parsed_url,
--					     Max_sessions,
--					     Max_pipeline_size,
--					     {SSLOptions, IsSSL}) of
--		{ok, Conn_Pid} ->
--		    do_send_req(Conn_Pid, Parsed_url, Headers,
--				Method, Body, Options_1, Timeout);
--		Err ->
--		    Err
--	    end;
--	Err ->
--	    {error, {url_parsing_failed, Err}}
-+        #url{host = Host,
-+             port = Port,
-+             protocol = Protocol} = Parsed_url ->
-+            Lb_pid = case ets:lookup(ibrowse_lb, {Host, Port}) of
-+                         [] ->
-+                             get_lb_pid(Parsed_url);
-+                         [#lb_pid{pid = Lb_pid_1}] ->
-+                             Lb_pid_1
-+                     end,
-+            Max_sessions = get_max_sessions(Host, Port, Options),
-+            Max_pipeline_size = get_max_pipeline_size(Host, Port, Options),
-+            Options_1 = merge_options(Host, Port, Options),
-+            {SSLOptions, IsSSL} =
-+                case (Protocol == https) orelse
-+                     get_value(is_ssl, Options_1, false) of
-+                    false -> {[], false};
-+                    true -> {get_value(ssl_options, Options_1, []), true}
-+                end,
-+            case ibrowse_lb:spawn_connection(Lb_pid, Parsed_url,
-+                                             Max_sessions, 
-+                                             Max_pipeline_size,
-+                                             {SSLOptions, IsSSL}) of
-+                {ok, Conn_Pid} ->
-+                    do_send_req(Conn_Pid, Parsed_url, Headers,
-+                                Method, Body, Options_1, Timeout);
-+                Err ->
-+                    Err
-+            end;
-+        Err ->
-+            {error, {url_parsing_failed, Err}}
-     end.
- 
- merge_options(Host, Port, Options) ->
-     Config_options = get_config_value({options, Host, Port}, []),
-     lists:foldl(
-       fun({Key, Val}, Acc) ->
--			case lists:keysearch(Key, 1, Options) of
--			    false ->
--				[{Key, Val} | Acc];
--			    _ ->
--				Acc
--			end
-+                        case lists:keysearch(Key, 1, Options) of
-+                            false ->
-+                                [{Key, Val} | Acc];
-+                            _ ->
-+                                Acc
-+                        end
-       end, Options, Config_options).
- 
- get_lb_pid(Url) ->
-@@ -322,11 +337,11 @@ get_lb_pid(Url) ->
- 
- get_max_sessions(Host, Port, Options) ->
-     get_value(max_sessions, Options,
--	      get_config_value({max_sessions, Host, Port}, ?DEF_MAX_SESSIONS)).
-+              get_config_value({max_sessions, Host, Port}, ?DEF_MAX_SESSIONS)).
- 
- get_max_pipeline_size(Host, Port, Options) ->
-     get_value(max_pipeline_size, Options,
--	      get_config_value({max_pipeline_size, Host, Port}, ?DEF_MAX_PIPELINE_SIZE)).
-+              get_config_value({max_pipeline_size, Host, Port}, ?DEF_MAX_PIPELINE_SIZE)).
- 
- %% @doc Deprecated. Use set_max_sessions/3 and set_max_pipeline_size/3
- %% for achieving the same effect.
-@@ -343,7 +358,7 @@ set_dest(_Host, _Port, [H | _]) ->
-     exit({invalid_option, H});
- set_dest(_, _, []) ->
-     ok.
--
-+    
- %% @doc Set the maximum number of connections allowed to a specific Host:Port.
- %% @spec set_max_sessions(Host::string(), Port::integer(), Max::integer()) -> ok
- set_max_sessions(Host, Port, Max) when is_integer(Max), Max > 0 ->
-@@ -356,21 +371,21 @@ set_max_pipeline_size(Host, Port, Max) when is_integer(Max), Max > 0 ->
- 
- do_send_req(Conn_Pid, Parsed_url, Headers, Method, Body, Options, Timeout) ->
-     case catch ibrowse_http_client:send_req(Conn_Pid, Parsed_url,
--					    Headers, Method, ensure_bin(Body),
--					    Options, Timeout) of
--	{'EXIT', {timeout, _}} ->
--	    {error, req_timedout};
--	{'EXIT', Reason} ->
--	    {error, {'EXIT', Reason}};
--	{ok, St_code, Headers, Body} = Ret when is_binary(Body) ->
--	    case get_value(response_format, Options, list) of
--		list ->
--		    {ok, St_code, Headers, binary_to_list(Body)};
--		binary ->
--		    Ret
--	    end;
--	Ret ->
--	    Ret
-+                                            Headers, Method, ensure_bin(Body),
-+                                            Options, Timeout) of
-+        {'EXIT', {timeout, _}} ->
-+            {error, req_timedout};
-+        {'EXIT', Reason} ->
-+            {error, {'EXIT', Reason}};
-+        {ok, St_code, Headers, Body} = Ret when is_binary(Body) ->
-+            case get_value(response_format, Options, list) of
-+                list ->
-+                    {ok, St_code, Headers, binary_to_list(Body)};
-+                binary ->
-+                    Ret
-+            end;
-+        Ret ->
-+            Ret
-     end.
- 
- ensure_bin(L) when is_list(L)                     -> list_to_binary(L);
-@@ -391,12 +406,21 @@ ensure_bin({Fun, _} = Body) when is_function(Fun) -> Body.
- %% <b>Note:</b> It is the responsibility of the calling process to control
- %% pipeline size on such connections.
- %%
-+%% @spec spawn_worker_process(Url::string()) -> {ok, pid()}
-+spawn_worker_process(Url) ->
-+    ibrowse_http_client:start(Url).
-+
- %% @spec spawn_worker_process(Host::string(), Port::integer()) -> {ok, pid()}
- spawn_worker_process(Host, Port) ->
-     ibrowse_http_client:start({Host, Port}).
- 
--%% @doc Same as spawn_worker_process/2 except the the calling process
-+%% @doc Same as spawn_worker_process/1 except the the calling process
- %% is linked to the worker process which is spawned.
-+%% @spec spawn_link_worker_process(Url::string()) -> {ok, pid()}
-+spawn_link_worker_process(Url) ->
-+    ibrowse_http_client:start_link(Url).
-+
-+%% @spec spawn_link_worker_process(Host::string(), Port::integer()) -> {ok, pid()}
- spawn_link_worker_process(Host, Port) ->
-     ibrowse_http_client:start_link({Host, Port}).
- 
-@@ -426,30 +450,30 @@ send_req_direct(Conn_pid, Url, Headers, Method, Body, Options) ->
- %% returned by spawn_worker_process/2 or spawn_link_worker_process/2
- send_req_direct(Conn_pid, Url, Headers, Method, Body, Options, Timeout) ->
-     case catch parse_url(Url) of
--	#url{host = Host,
--	     port = Port} = Parsed_url ->
--	    Options_1 = merge_options(Host, Port, Options),
--	    case do_send_req(Conn_pid, Parsed_url, Headers, Method, Body, Options_1, Timeout) of
--		{error, {'EXIT', {noproc, _}}} ->
--		    {error, worker_is_dead};
--		Ret ->
--		    Ret
--	    end;
--	Err ->
--	    {error, {url_parsing_failed, Err}}
-+        #url{host = Host,
-+             port = Port} = Parsed_url ->
-+            Options_1 = merge_options(Host, Port, Options),
-+            case do_send_req(Conn_pid, Parsed_url, Headers, Method, Body, Options_1, Timeout) of
-+                {error, {'EXIT', {noproc, _}}} ->
-+                    {error, worker_is_dead};
-+                Ret ->
-+                    Ret
-+            end;
-+        Err ->
-+            {error, {url_parsing_failed, Err}}
-     end.
- 
- %% @doc Tell ibrowse to stream the next chunk of data to the
- %% caller. Should be used in conjunction with the
- %% <code>stream_to</code> option
- %% @spec stream_next(Req_id :: req_id()) -> ok | {error, unknown_req_id}
--stream_next(Req_id) ->
-+stream_next(Req_id) ->    
-     case ets:lookup(ibrowse_stream, {req_id_pid, Req_id}) of
--	[] ->
--	    {error, unknown_req_id};
--	[{_, Pid}] ->
--	    catch Pid ! {stream_next, Req_id},
--	    ok
-+        [] ->
-+            {error, unknown_req_id};
-+        [{_, Pid}] ->
-+            catch Pid ! {stream_next, Req_id},
-+            ok
-     end.
- 
- %% @doc Turn tracing on for the ibrowse process
-@@ -462,7 +486,7 @@ trace_off() ->
- %% @doc Turn tracing on for all connections to the specified HTTP
- %% server. Host is whatever is specified as the domain name in the URL
- %% @spec trace_on(Host, Port) -> ok
--%% Host = string()
-+%% Host = string() 
- %% Port = integer()
- trace_on(Host, Port) ->
-     ibrowse ! {trace, true, Host, Port},
-@@ -483,75 +507,75 @@ all_trace_off() ->
- 
- show_dest_status() ->
-     Dests = lists:filter(fun({lb_pid, {Host, Port}, _}) when is_list(Host),
--							     is_integer(Port) ->
--				 true;
--			    (_) ->
--				 false
--			 end, ets:tab2list(ibrowse_lb)),
-+                                                             is_integer(Port) ->
-+                                 true;
-+                            (_) ->
-+                                 false
-+                         end, ets:tab2list(ibrowse_lb)),
-     All_ets = ets:all(),
-     io:format("~-40.40s | ~-5.5s | ~-10.10s | ~s~n",
--	      ["Server:port", "ETS", "Num conns", "LB Pid"]),
-+              ["Server:port", "ETS", "Num conns", "LB Pid"]),
-     io:format("~80.80.=s~n", [""]),
-     lists:foreach(fun({lb_pid, {Host, Port}, Lb_pid}) ->
--			  case lists:dropwhile(
--				 fun(Tid) ->
--					 ets:info(Tid, owner) /= Lb_pid
--				 end, All_ets) of
--			      [] ->
--				  io:format("~40.40s | ~-5.5s | ~-5.5s | ~s~n",
--					    [Host ++ ":" ++ integer_to_list(Port),
--					     "",
--					     "",
--					     io_lib:format("~p", [Lb_pid])]
--					   );
--			      [Tid | _] ->
--				  catch (
--				    begin
--					Size = ets:info(Tid, size),
--					io:format("~40.40s | ~-5.5s | ~-5.5s | ~s~n",
--						  [Host ++ ":" ++ integer_to_list(Port),
--						   integer_to_list(Tid),
--						   integer_to_list(Size),
--						   io_lib:format("~p", [Lb_pid])]
--						 )
--				    end
--				   )
--				  end
--		  end, Dests).
--
-+                          case lists:dropwhile(
-+                                 fun(Tid) ->
-+                                         ets:info(Tid, owner) /= Lb_pid
-+                                 end, All_ets) of
-+                              [] ->
-+                                  io:format("~40.40s | ~-5.5s | ~-5.5s | ~s~n",
-+                                            [Host ++ ":" ++ integer_to_list(Port),
-+                                             "",
-+                                             "",
-+                                             io_lib:format("~p", [Lb_pid])]
-+                                           );
-+                              [Tid | _] ->
-+                                  catch (
-+                                    begin
-+                                        Size = ets:info(Tid, size),
-+                                        io:format("~40.40s | ~-5.5s | ~-5.5s | ~s~n",
-+                                                  [Host ++ ":" ++ integer_to_list(Port),
-+                                                   io_lib:format("~p", [Tid]),
-+                                                   integer_to_list(Size),
-+                                                   io_lib:format("~p", [Lb_pid])]
-+                                                 )
-+                                    end
-+                                   )
-+                                  end
-+                  end, Dests).
-+                                          
- %% @doc Shows some internal information about load balancing to a
- %% specified Host:Port. Info about workers spawned using
- %% spawn_worker_process/2 or spawn_link_worker_process/2 is not
- %% included.
- show_dest_status(Host, Port) ->
-     case ets:lookup(ibrowse_lb, {Host, Port}) of
--	[] ->
--	    no_active_processes;
--	[#lb_pid{pid = Lb_pid}] ->
--	    io:format("Load Balancer Pid     : ~p~n", [Lb_pid]),
--	    io:format("LB process msg q size : ~p~n", [(catch process_info(Lb_pid, message_queue_len))]),
--	    case lists:dropwhile(
--		   fun(Tid) ->
--			   ets:info(Tid, owner) /= Lb_pid
--		   end, ets:all()) of
--		[] ->
--		    io:format("Couldn't locate ETS table for ~p~n", [Lb_pid]);
--		[Tid | _] ->
--		    First = ets:first(Tid),
--		    Last = ets:last(Tid),
--		    Size = ets:info(Tid, size),
--		    io:format("LB ETS table id       : ~p~n", [Tid]),
--		    io:format("Num Connections       : ~p~n", [Size]),
--		    case Size of
--			0 ->
--			    ok;
--			_ ->
--			    {First_p_sz, _} = First,
--			    {Last_p_sz, _} = Last,
--			    io:format("Smallest pipeline     : ~1000.p~n", [First_p_sz]),
--			    io:format("Largest pipeline      : ~1000.p~n", [Last_p_sz])
--		    end
--	    end
-+        [] ->
-+            no_active_processes;
-+        [#lb_pid{pid = Lb_pid}] ->
-+            io:format("Load Balancer Pid     : ~p~n", [Lb_pid]),
-+            io:format("LB process msg q size : ~p~n", [(catch process_info(Lb_pid, message_queue_len))]),
-+            case lists:dropwhile(
-+                   fun(Tid) ->
-+                           ets:info(Tid, owner) /= Lb_pid
-+                   end, ets:all()) of
-+                [] ->
-+                    io:format("Couldn't locate ETS table for ~p~n", [Lb_pid]);
-+                [Tid | _] ->
-+                    First = ets:first(Tid),
-+                    Last = ets:last(Tid),
-+                    Size = ets:info(Tid, size),
-+                    io:format("LB ETS table id       : ~p~n", [Tid]),
-+                    io:format("Num Connections       : ~p~n", [Size]),
-+                    case Size of
-+                        0 ->
-+                            ok;
-+                        _ ->
-+                            {First_p_sz, _} = First,
-+                            {Last_p_sz, _} = Last,
-+                            io:format("Smallest pipeline     : ~1000.p~n", [First_p_sz]),
-+                            io:format("Largest pipeline      : ~1000.p~n", [Last_p_sz])
-+                    end
-+            end
-     end.
- 
- %% @doc Clear current configuration for ibrowse and load from the file
-@@ -592,40 +616,40 @@ init(_) ->
- 
- import_config() ->
-     case code:priv_dir(ibrowse) of
--	{error, _} = Err ->
--	    Err;
--	PrivDir ->
--	    Filename = filename:join(PrivDir, "ibrowse.conf"),
--	    import_config(Filename)
-+        {error, _} = Err ->
-+            Err;
-+        PrivDir ->
-+            Filename = filename:join(PrivDir, "ibrowse.conf"),
-+            import_config(Filename)
-     end.
- 
- import_config(Filename) ->
-     case file:consult(Filename) of
--	{ok, Terms} ->
--	    ets:delete_all_objects(ibrowse_conf),
--	    Fun = fun({dest, Host, Port, MaxSess, MaxPipe, Options})
--		     when is_list(Host), is_integer(Port),
--		          is_integer(MaxSess), MaxSess > 0,
--		          is_integer(MaxPipe), MaxPipe > 0, is_list(Options) ->
--			  I = [{{max_sessions, Host, Port}, MaxSess},
--			       {{max_pipeline_size, Host, Port}, MaxPipe},
--			       {{options, Host, Port}, Options}],
--			  lists:foreach(
--			    fun({X, Y}) ->
--				    ets:insert(ibrowse_conf,
--					       #ibrowse_conf{key = X,
--							     value = Y})
--			    end, I);
--		     ({K, V}) ->
--			  ets:insert(ibrowse_conf,
--				     #ibrowse_conf{key = K,
--						   value = V});
--		     (X) ->
--			  io:format("Skipping unrecognised term: ~p~n", [X])
--		  end,
--	    lists:foreach(Fun, Terms);
--	Err ->
--	    Err
-+        {ok, Terms} ->
-+            ets:delete_all_objects(ibrowse_conf),
-+            Fun = fun({dest, Host, Port, MaxSess, MaxPipe, Options}) 
-+                     when is_list(Host), is_integer(Port),
-+                          is_integer(MaxSess), MaxSess > 0,
-+                          is_integer(MaxPipe), MaxPipe > 0, is_list(Options) ->
-+                          I = [{{max_sessions, Host, Port}, MaxSess},
-+                               {{max_pipeline_size, Host, Port}, MaxPipe},
-+                               {{options, Host, Port}, Options}],
-+                          lists:foreach(
-+                            fun({X, Y}) ->
-+                                    ets:insert(ibrowse_conf,
-+                                               #ibrowse_conf{key = X, 
-+                                                             value = Y})
-+                            end, I);
-+                     ({K, V}) ->
-+                          ets:insert(ibrowse_conf,
-+                                     #ibrowse_conf{key = K,
-+                                                   value = V});
-+                     (X) ->
-+                          io:format("Skipping unrecognised term: ~p~n", [X])
-+                  end,
-+            lists:foreach(Fun, Terms);
-+        Err ->
-+            Err
-     end.
- 
- %% @doc Internal export
-@@ -636,10 +660,10 @@ get_config_value(Key) ->
- %% @doc Internal export
- get_config_value(Key, DefVal) ->
-     case ets:lookup(ibrowse_conf, Key) of
--	[] ->
--	    DefVal;
--	[#ibrowse_conf{value = V}] ->
--	    V
-+        [] ->
-+            DefVal;
-+        [#ibrowse_conf{value = V}] ->
-+            V
-     end.
- 
- set_config_value(Key, Val) ->
-@@ -700,36 +724,36 @@ handle_info(all_trace_off, State) ->
-     Mspec = [{{ibrowse_conf,{trace,'$1','$2'},true},[],[{{'$1','$2'}}]}],
-     Trace_on_dests = ets:select(ibrowse_conf, Mspec),
-     Fun = fun(#lb_pid{host_port = {H, P}, pid = Pid}, _) ->
--		  case lists:member({H, P}, Trace_on_dests) of
--		      false ->
--			  ok;
--		      true ->
--			  catch Pid ! {trace, false}
--		  end;
--	     (_, Acc) ->
--		  Acc
--	  end,
-+                  case lists:member({H, P}, Trace_on_dests) of
-+                      false ->
-+                          ok;
-+                      true ->
-+                          catch Pid ! {trace, false}
-+                  end;
-+             (_, Acc) ->
-+                  Acc
-+          end,
-     ets:foldl(Fun, undefined, ibrowse_lb),
-     ets:select_delete(ibrowse_conf, [{{ibrowse_conf,{trace,'$1','$2'},true},[],['true']}]),
-     {noreply, State};
--
-+                                  
- handle_info({trace, Bool}, State) ->
-     put(my_trace_flag, Bool),
-     {noreply, State};
- 
- handle_info({trace, Bool, Host, Port}, State) ->
-     Fun = fun(#lb_pid{host_port = {H, P}, pid = Pid}, _)
--	     when H == Host,
--		  P == Port ->
--		  catch Pid ! {trace, Bool};
--	     (_, Acc) ->
--		  Acc
--	  end,
-+             when H == Host,
-+                  P == Port ->
-+                  catch Pid ! {trace, Bool};
-+             (_, Acc) ->
-+                  Acc
-+          end,
-     ets:foldl(Fun, undefined, ibrowse_lb),
-     ets:insert(ibrowse_conf, #ibrowse_conf{key = {trace, Host, Port},
--					   value = Bool}),
-+                                           value = Bool}),
-     {noreply, State};
--
-+                     
- handle_info(_Info, State) ->
-     {noreply, State}.
- 
-diff --git a/couchdb-1.0.1/src/ibrowse/ibrowse_app.erl b/couchdb-1.0.1/src/ibrowse/ibrowse_app.erl
-index 8c83e8f..d3a0f7b 100644
---- a/couchdb-1.0.1/src/ibrowse/ibrowse_app.erl
-+++ b/couchdb-1.0.1/src/ibrowse/ibrowse_app.erl
-@@ -1,12 +1,11 @@
- %%%-------------------------------------------------------------------
- %%% File    : ibrowse_app.erl
- %%% Author  : Chandrashekhar Mullaparthi <[e-mail]>
--%%% Description :
-+%%% Description : 
- %%%
- %%% Created : 15 Oct 2003 by Chandrashekhar Mullaparthi <[e-mail]>
- %%%-------------------------------------------------------------------
- -module(ibrowse_app).
---vsn('$Id: ibrowse_app.erl,v 1.1 2005/05/05 22:28:28 chandrusf Exp $ ').
- 
- -behaviour(application).
- %%--------------------------------------------------------------------
-@@ -42,11 +41,11 @@
- %% Func: start/2
- %% Returns: {ok, Pid}        |
- %%          {ok, Pid, State} |
--%%          {error, Reason}
-+%%          {error, Reason}   
- %%--------------------------------------------------------------------
- start(_Type, _StartArgs) ->
-     case ibrowse_sup:start_link() of
--	{ok, Pid} ->
-+	{ok, Pid} -> 
- 	    {ok, Pid};
- 	Error ->
- 	    Error
-@@ -54,7 +53,7 @@ start(_Type, _StartArgs) ->
- 
- %%--------------------------------------------------------------------
- %% Func: stop/1
--%% Returns: any
-+%% Returns: any 
- %%--------------------------------------------------------------------
- stop(_State) ->
-     ok.
-diff --git a/couchdb-1.0.1/src/ibrowse/ibrowse_http_client.erl b/couchdb-1.0.1/src/ibrowse/ibrowse_http_client.erl
-index 65d9cb9..1633e5b 100644
---- a/couchdb-1.0.1/src/ibrowse/ibrowse_http_client.erl
-+++ b/couchdb-1.0.1/src/ibrowse/ibrowse_http_client.erl
-@@ -6,8 +6,6 @@
- %%% Created : 11 Oct 2003 by Chandrashekhar Mullaparthi <[e-mail]>
- %%%-------------------------------------------------------------------
- -module(ibrowse_http_client).
---vsn('$Id: ibrowse_http_client.erl,v 1.19 2009/07/01 22:43:19 chandrusf Exp $ ').
--
- -behaviour(gen_server).
- %%--------------------------------------------------------------------
- %% Include files
-@@ -16,11 +14,11 @@
- %%--------------------------------------------------------------------
- %% External exports
- -export([
--	 start_link/1,
--	 start/1,
--	 stop/1,
--	 send_req/7
--	]).
-+         start_link/1,
-+         start/1,
-+         stop/1,
-+         send_req/7
-+        ]).
- 
- -ifdef(debug).
- -compile(export_all).
-@@ -28,41 +26,45 @@
- 
- %% gen_server callbacks
- -export([
--	 init/1,
--	 handle_call/3,
--	 handle_cast/2,
--	 handle_info/2,
--	 terminate/2,
--	 code_change/3
--	]).
-+         init/1,
-+         handle_call/3,
-+         handle_cast/2,
-+         handle_info/2,
-+         terminate/2,
-+         code_change/3
-+        ]).
- 
- -include("ibrowse.hrl").
- 
---record(state, {host, port,
--		use_proxy = false, proxy_auth_digest,
--		ssl_options = [], is_ssl = false, socket,
--		reqs=queue:new(), cur_req, status=idle, http_status_code,
--		reply_buffer = <<>>, rep_buf_size=0, streamed_size = 0,
--		recvd_headers=[],
--		is_closing, send_timer, content_length,
--		deleted_crlf = false, transfer_encoding,
--		chunk_size, chunk_size_buffer = <<>>, recvd_chunk_size,
--		lb_ets_tid, cur_pipeline_size = 0, prev_req_id
--	       }).
-+-record(state, {host, port, connect_timeout,
-+                use_proxy = false, proxy_auth_digest,
-+                ssl_options = [], is_ssl = false, socket,
-+                proxy_tunnel_setup = false,
-+                tunnel_setup_queue = [],
-+                reqs=queue:new(), cur_req, status=idle, http_status_code,
-+                reply_buffer = <<>>, rep_buf_size=0, streamed_size = 0,
-+                recvd_headers=[],
-+                status_line, raw_headers, 
-+                is_closing, send_timer, content_length,
-+                deleted_crlf = false, transfer_encoding,
-+                chunk_size, chunk_size_buffer = <<>>, recvd_chunk_size,
-+                lb_ets_tid, cur_pipeline_size = 0, prev_req_id
-+               }).
- 
- -record(request, {url, method, options, from,
--		  stream_to, caller_controls_socket = false,
--		  req_id,
--		  stream_chunk_size,
--		  save_response_to_file = false,
--		  tmp_file_name, tmp_file_fd,
--		  response_format}).
-+                  stream_to, caller_controls_socket = false, 
-+                  caller_socket_options = [],
-+                  req_id,
-+                  stream_chunk_size,
-+                  save_response_to_file = false, 
-+                  tmp_file_name, tmp_file_fd,
-+                  response_format}).
- 
- -import(ibrowse_lib, [
--		      get_value/2,
--		      get_value/3,
--		      do_trace/2
--		     ]).
-+                      get_value/2,
-+                      get_value/3,
-+                      do_trace/2
-+                     ]).
- 
- -define(DEFAULT_STREAM_CHUNK_SIZE, 1024*1024).
- 
-@@ -80,7 +82,8 @@ start_link(Args) ->
-     gen_server:start_link(?MODULE, Args, []).
- 
- stop(Conn_pid) ->
--    gen_server:call(Conn_pid, stop).
-+    catch gen_server:call(Conn_pid, stop),
-+    ok.
- 
- send_req(Conn_Pid, Url, Headers, Method, Body, Options, Timeout) ->
-     gen_server:call(
-@@ -101,26 +104,23 @@ send_req(Conn_Pid, Url, Headers, Method, Body, Options, Timeout) ->
- %%--------------------------------------------------------------------
- init({Lb_Tid, #url{host = Host, port = Port}, {SSLOptions, Is_ssl}}) ->
-     State = #state{host = Host,
--		   port = Port,
--		   ssl_options = SSLOptions,
--		   is_ssl = Is_ssl,
--		   lb_ets_tid = Lb_Tid},
-+                   port = Port,
-+                   ssl_options = SSLOptions,
-+                   is_ssl = Is_ssl,
-+                   lb_ets_tid = Lb_Tid},
-     put(ibrowse_trace_token, [Host, $:, integer_to_list(Port)]),
-     put(my_trace_flag, ibrowse_lib:get_trace_status(Host, Port)),
-     {ok, State};
-+init(Url) when is_list(Url) ->
-+    case catch ibrowse_lib:parse_url(Url) of
-+        #url{protocol = Protocol} = Url_rec ->
-+            init({undefined, Url_rec, {[], Protocol == https}});
-+        {'EXIT', _} ->
-+            {error, invalid_url}
-+    end;
- init({Host, Port}) ->
-     State = #state{host = Host,
--		   port = Port},
--    put(ibrowse_trace_token, [Host, $:, integer_to_list(Port)]),
--    put(my_trace_flag, ibrowse_lib:get_trace_status(Host, Port)),
--    {ok, State};
--init(#url{host=Host, port=Port, protocol=Protocol}) ->
--    State = #state{
--        host = Host,
--        port = Port,
--        is_ssl = (Protocol == https),
--        ssl_options = [{ssl_imp, new}, {depth, 9}]
--    },
-+                   port = Port},
-     put(ibrowse_trace_token, [Host, $:, integer_to_list(Port)]),
-     put(my_trace_flag, ibrowse_lib:get_trace_status(Host, Port)),
-     {ok, State}.
-@@ -141,13 +141,13 @@ handle_call({send_req, _}, _From, #state{is_closing = true} = State) ->
-     {reply, {error, connection_closing}, State};
- 
- handle_call({send_req, {Url, Headers, Method, Body, Options, Timeout}},
--	    From, State) ->
-+            From, State) ->
-     send_req_1(From, Url, Headers, Method, Body, Options, Timeout, State);
- 
- handle_call(stop, _From, State) ->
-     do_close(State),
-     do_error_reply(State, closing_on_request),
--    {stop, normal, ok, State#state{socket=undefined}};
-+    {stop, normal, ok, State};
- 
- handle_call(Request, _From, State) ->
-     Reply = {unknown_request, Request},
-@@ -177,9 +177,8 @@ handle_info({ssl, _Sock, Data}, State) ->
-     handle_sock_data(Data, State);
- 
- handle_info({stream_next, Req_id}, #state{socket = Socket,
--					  is_ssl = Is_ssl,
--					  cur_req = #request{req_id = Req_id}} = State) ->
--    do_setopts(Socket, [{active, once}], Is_ssl),
-+                                          cur_req = #request{req_id = Req_id}} = State) ->
-+    do_setopts(Socket, [{active, once}], State),
-     {noreply, State};
- 
- handle_info({stream_next, _Req_id}, State) ->
-@@ -204,13 +203,13 @@ handle_info({ssl_error, _Sock}, State) ->
-     {stop, normal, State};
- 
- handle_info({req_timedout, From}, State) ->
--    case lists:keysearch(From, #request.from, queue:to_list(State#state.reqs)) of
--	false ->
--	    {noreply, State};
--	{value, _} ->
--	    shutting_down(State),
--	    do_error_reply(State, req_timedout),
--	    {stop, normal, State}
-+    case lists:keymember(From, #request.from, queue:to_list(State#state.reqs)) of
-+        false ->
-+            {noreply, State};
-+        true ->
-+            shutting_down(State),
-+            do_error_reply(State, req_timedout),
-+            {stop, normal, State}
-     end;
- 
- handle_info(timeout, State) ->
-@@ -224,7 +223,7 @@ handle_info({trace, Bool}, State) ->
- 
- handle_info(Info, State) ->
-     io:format("Unknown message recvd for ~1000.p:~1000.p -> ~p~n",
--	      [State#state.host, State#state.port, Info]),
-+              [State#state.host, State#state.port, Info]),
-     io:format("Recvd unknown message ~p when in state: ~p~n", [Info, State]),
-     {noreply, State}.
- 
-@@ -260,133 +259,132 @@ handle_sock_data(Data, #state{status=idle}=State) ->
- 
- handle_sock_data(Data, #state{status = get_header}=State) ->
-     case parse_response(Data, State) of
--	{error, _Reason} ->
--	    shutting_down(State),
--	    {stop, normal, State};
--	stop ->
--	    shutting_down(State),
--	    {stop, normal, State};
--	State_1 ->
--	    active_once(State_1),
--	    {noreply, State_1, get_inac_timeout(State_1)}
-+        {error, _Reason} ->
-+            shutting_down(State),
-+            {stop, normal, State};
-+        State_1 ->
-+            active_once(State_1),
-+            set_inac_timer(State_1),
-+            {noreply, State_1}
-     end;
- 
- handle_sock_data(Data, #state{status           = get_body,
--			      content_length   = CL,
--			      http_status_code = StatCode,
--			      recvd_headers    = Headers,
--			      chunk_size       = CSz} = State) ->
-+                              content_length   = CL,
-+                              http_status_code = StatCode,
-+                              recvd_headers    = Headers,
-+                              chunk_size       = CSz} = State) ->
-     case (CL == undefined) and (CSz == undefined) of
--	true ->
--	    case accumulate_response(Data, State) of
--		{error, Reason} ->
--		    shutting_down(State),
--		    fail_pipelined_requests(State,
--					    {error, {Reason, {stat_code, StatCode}, Headers}}),
--		    {stop, normal, State};
--		State_1 ->
--		    active_once(State_1),
--		    {noreply, State_1, get_inac_timeout(State_1)}
--	    end;
--	_ ->
--	    case parse_11_response(Data, State) of
--		{error, Reason} ->
--		    shutting_down(State),
--		    fail_pipelined_requests(State,
--					    {error, {Reason, {stat_code, StatCode}, Headers}}),
--		    {stop, normal, State};
--		stop ->
--		    shutting_down(State),
--		    {stop, normal, State};
--		State_1 ->
--		    active_once(State_1),
--		    {noreply, State_1, get_inac_timeout(State_1)}
--	    end
-+        true ->
-+            case accumulate_response(Data, State) of
-+                {error, Reason} ->
-+                    shutting_down(State),
-+                    fail_pipelined_requests(State,
-+                                            {error, {Reason, {stat_code, StatCode}, Headers}}),
-+                    {stop, normal, State};
-+                State_1 ->
-+                    active_once(State_1),
-+                    set_inac_timer(State_1),
-+                    {noreply, State_1}
-+            end;
-+        _ ->
-+            case parse_11_response(Data, State) of
-+                {error, Reason} ->
-+                    shutting_down(State),
-+                    fail_pipelined_requests(State,
-+                                            {error, {Reason, {stat_code, StatCode}, Headers}}),
-+                    {stop, normal, State};
-+                State_1 ->
-+                    active_once(State_1),
-+                    set_inac_timer(State_1),
-+                    {noreply, State_1}
-+            end
-     end.
- 
- accumulate_response(Data,
--		    #state{
--		      cur_req = #request{save_response_to_file = true,
--					 tmp_file_fd = undefined} = CurReq,
--		      http_status_code=[$2 | _]}=State) ->
--    TmpFilename = make_tmp_filename(),
-+                    #state{
-+                      cur_req = #request{save_response_to_file = Srtf,
-+                                         tmp_file_fd = undefined} = CurReq,
-+                      http_status_code=[$2 | _]}=State) when Srtf /= false ->
-+    TmpFilename = make_tmp_filename(Srtf),
-     case file:open(TmpFilename, [write, delayed_write, raw]) of
--	{ok, Fd} ->
--	    accumulate_response(Data, State#state{
--					cur_req = CurReq#request{
--						    tmp_file_fd = Fd,
--						    tmp_file_name = TmpFilename}});
--	{error, Reason} ->
--	    {error, {file_open_error, Reason}}
-+        {ok, Fd} ->
-+            accumulate_response(Data, State#state{
-+                                        cur_req = CurReq#request{
-+                                                    tmp_file_fd = Fd,
-+                                                    tmp_file_name = TmpFilename}});
-+        {error, Reason} ->
-+            {error, {file_open_error, Reason}}
-     end;
--accumulate_response(Data, #state{cur_req = #request{save_response_to_file = true,
--						    tmp_file_fd = Fd},
--				 transfer_encoding=chunked,
--				 reply_buffer = Reply_buf,
--				 http_status_code=[$2 | _]
--				} = State) ->
-+accumulate_response(Data, #state{cur_req = #request{save_response_to_file = Srtf,
-+                                                    tmp_file_fd = Fd},
-+                                 transfer_encoding=chunked,
-+                                 reply_buffer = Reply_buf,
-+                                 http_status_code=[$2 | _]
-+                                } = State) when Srtf /= false ->
-     case file:write(Fd, [Reply_buf, Data]) of
--	ok ->
--	    State#state{reply_buffer = <<>>};
--	{error, Reason} ->
--	    {error, {file_write_error, Reason}}
-+        ok ->
-+            State#state{reply_buffer = <<>>};
-+        {error, Reason} ->
-+            {error, {file_write_error, Reason}}
-     end;
--accumulate_response(Data, #state{cur_req = #request{save_response_to_file = true,
--						    tmp_file_fd = Fd},
--				 reply_buffer = RepBuf,
--				 http_status_code=[$2 | _]
--				} = State) ->
-+accumulate_response(Data, #state{cur_req = #request{save_response_to_file = Srtf,
-+                                                    tmp_file_fd = Fd},
-+                                 reply_buffer = RepBuf,
-+                                 http_status_code=[$2 | _]
-+                                } = State) when Srtf /= false ->
-     case file:write(Fd, [RepBuf, Data]) of
--	ok ->
--	    State#state{reply_buffer = <<>>};
--	{error, Reason} ->
--	    {error, {file_write_error, Reason}}
-+        ok ->
-+            State#state{reply_buffer = <<>>};
-+        {error, Reason} ->
-+            {error, {file_write_error, Reason}}
-     end;
- accumulate_response(<<>>, State) ->
-     State;
- accumulate_response(Data, #state{reply_buffer = RepBuf,
--				 rep_buf_size = RepBufSize,
--				 streamed_size = Streamed_size,
--				 cur_req = CurReq}=State) ->
-+                                 rep_buf_size = RepBufSize,
-+                                 streamed_size = Streamed_size,
-+                                 cur_req = CurReq}=State) ->
-     #request{stream_to=StreamTo, req_id=ReqId,
--	     stream_chunk_size = Stream_chunk_size,
--	     response_format = Response_format,
--	     caller_controls_socket = Caller_controls_socket} = CurReq,
-+             stream_chunk_size = Stream_chunk_size,
-+             response_format = Response_format,
-+             caller_controls_socket = Caller_controls_socket} = CurReq,
-     RepBuf_1 = list_to_binary([RepBuf, Data]),
-     New_data_size = RepBufSize - Streamed_size,
-     case StreamTo of
--	undefined ->
--	    State#state{reply_buffer = RepBuf_1};
--	_ when Caller_controls_socket == true ->
--	    do_interim_reply(StreamTo, Response_format, ReqId, RepBuf_1),
--	    State#state{reply_buffer = <<>>,
--			streamed_size = Streamed_size + size(RepBuf_1)};
--	_ when New_data_size >= Stream_chunk_size ->
--	    {Stream_chunk, Rem_data} = split_binary(RepBuf_1, Stream_chunk_size),
--	    do_interim_reply(StreamTo, Response_format, ReqId, Stream_chunk),
--	    accumulate_response(
--	      Rem_data,
--	      State#state{
--		reply_buffer = <<>>,
--		streamed_size = Streamed_size + Stream_chunk_size});
--	_ ->
--	    State#state{reply_buffer = RepBuf_1}
-+        undefined ->
-+            State#state{reply_buffer = RepBuf_1};
-+        _ when Caller_controls_socket == true ->
-+            do_interim_reply(StreamTo, Response_format, ReqId, RepBuf_1),
-+            State#state{reply_buffer = <<>>, 
-+                        streamed_size = Streamed_size + size(RepBuf_1)};
-+        _ when New_data_size >= Stream_chunk_size ->
-+            {Stream_chunk, Rem_data} = split_binary(RepBuf_1, Stream_chunk_size),
-+            do_interim_reply(StreamTo, Response_format, ReqId, Stream_chunk),
-+            accumulate_response(
-+              Rem_data,
-+              State#state{
-+                reply_buffer = <<>>,
-+                streamed_size = Streamed_size + Stream_chunk_size});
-+        _ ->
-+            State#state{reply_buffer = RepBuf_1}
-     end.
- 
--make_tmp_filename() ->
-+make_tmp_filename(true) ->
-     DownloadDir = ibrowse:get_config_value(download_dir, filename:absname("./")),
-     {A,B,C} = now(),
-     filename:join([DownloadDir,
--		   "ibrowse_tmp_file_"++
--		   integer_to_list(A) ++
--		   integer_to_list(B) ++
--		   integer_to_list(C)]).
-+                   "ibrowse_tmp_file_"++
-+                   integer_to_list(A) ++
-+                   integer_to_list(B) ++
-+                   integer_to_list(C)]);
-+make_tmp_filename(File) when is_list(File) ->
-+    File.
- 
- 
- %%--------------------------------------------------------------------
- %% Handles the case when the server closes the socket
- %%--------------------------------------------------------------------
--handle_sock_closed(#state{status=get_header}=State) ->
-+handle_sock_closed(#state{status=get_header} = State) ->
-     shutting_down(State),
-     do_error_reply(State, connection_closed);
- 
-@@ -397,40 +395,73 @@ handle_sock_closed(#state{cur_req=undefined} = State) ->
- %% Connection-Close header and has closed the socket to indicate end
- %% of response. There maybe requests pipelined which need a response.
- handle_sock_closed(#state{reply_buffer = Buf, reqs = Reqs, http_status_code = SC,
--			  is_closing = IsClosing,
--			  cur_req = #request{tmp_file_name=TmpFilename,
--					     tmp_file_fd=Fd} = CurReq,
--			  status = get_body, recvd_headers = Headers}=State) ->
-+                          is_closing = IsClosing,
-+                          cur_req = #request{tmp_file_name=TmpFilename,
-+                                             tmp_file_fd=Fd} = CurReq,
-+                          status = get_body,
-+                          recvd_headers = Headers,
-+                          status_line = Status_line,
-+                          raw_headers = Raw_headers
-+                         }=State) ->
-     #request{from=From, stream_to=StreamTo, req_id=ReqId,
--	     response_format = Resp_format} = CurReq,
-+             response_format = Resp_format,
-+             options = Options} = CurReq,
-     case IsClosing of
--	true ->
--	    {_, Reqs_1} = queue:out(Reqs),
--	    case TmpFilename of
--		undefined ->
--		    do_reply(State, From, StreamTo, ReqId, Resp_format,
--			     {ok, SC, Headers, Buf});
--		_ ->
--		    file:close(Fd),
--		    do_reply(State, From, StreamTo, ReqId, Resp_format,
--			     {ok, SC, Headers, {file, TmpFilename}})
--	    end,
--	    do_error_reply(State#state{reqs = Reqs_1}, connection_closed),
--	    State;
--	_ ->
--	    do_error_reply(State, connection_closed),
--	    State
-+        true ->
-+            {_, Reqs_1} = queue:out(Reqs),
-+            Body = case TmpFilename of
-+                       undefined ->
-+                           Buf;
-+                       _ ->
-+                           file:close(Fd),
-+                           {file, TmpFilename}
-+                   end,
-+            Reply = case get_value(give_raw_headers, Options, false) of
-+                          true ->
-+                            {ok, Status_line, Raw_headers, Body};
-+                        false ->
-+                            {ok, SC, Headers, Buf}
-+                    end,
-+            do_reply(State, From, StreamTo, ReqId, Resp_format, Reply),
-+            do_error_reply(State#state{reqs = Reqs_1}, connection_closed),
-+            State;
-+        _ ->
-+            do_error_reply(State, connection_closed),
-+            State
-     end.
- 
--do_connect(Host, Port, _Options, #state{is_ssl=true, ssl_options=SSLOptions}, Timeout) ->
-+do_connect(Host, Port, Options, #state{is_ssl      = true,
-+                                       use_proxy   = false,
-+                                       ssl_options = SSLOptions},
-+           Timeout) ->
-+    Caller_socket_options = get_value(socket_options, Options, []),
-+    Other_sock_options = filter_sock_options(SSLOptions ++ Caller_socket_options),
-     ssl:connect(Host, Port,
--		[binary, {nodelay, true}, {active, false} | SSLOptions],
--		Timeout);
--do_connect(Host, Port, _Options, _State, Timeout) ->
--    gen_tcp:connect(Host, Port,
--		    [binary, {nodelay, true}, {active, false}],
--		    Timeout).
--
-+                [binary, {nodelay, true}, {active, false} | Other_sock_options],
-+                Timeout);
-+do_connect(Host, Port, Options, _State, Timeout) ->
-+    Caller_socket_options = get_value(socket_options, Options, []),
-+    Other_sock_options = filter_sock_options(Caller_socket_options),
-+    gen_tcp:connect(Host, to_integer(Port),
-+                    [binary, {nodelay, true}, {active, false} | Other_sock_options],
-+                    Timeout).
-+
-+%% We don't want the caller to specify certain options
-+filter_sock_options(Opts) ->
-+    lists:filter(fun({active, _}) ->
-+                         false;
-+                    ({packet, _}) ->
-+                         false;
-+                    (list) ->
-+                         false;
-+                    (_) ->
-+                         true
-+                 end, Opts).
-+
-+do_send(Req, #state{socket = Sock,
-+                    is_ssl = true,
-+                    use_proxy = true,
-+                    proxy_tunnel_setup = Pts}) when Pts /= done ->  gen_tcp:send(Sock, Req);
- do_send(Req, #state{socket = Sock, is_ssl = true})  ->  ssl:send(Sock, Req);
- do_send(Req, #state{socket = Sock, is_ssl = false}) ->  gen_tcp:send(Sock, Req).
- 
-@@ -450,261 +481,328 @@ do_send_body(Body, State) ->
- 
- do_send_body1(Source, Resp, State) ->
-     case Resp of
--	{ok, Data} ->
--	    do_send(Data, State),
--	    do_send_body({Source}, State);
--	{ok, Data, New_source_state} ->
--	    do_send(Data, State),
--	    do_send_body({Source, New_source_state}, State);
--	eof ->
--	    ok;
--	Err ->
--	    Err
-+        {ok, Data} ->
-+            do_send(Data, State),
-+            do_send_body({Source}, State);
-+        {ok, Data, New_source_state} ->
-+            do_send(Data, State),
-+            do_send_body({Source, New_source_state}, State);
-+        eof ->
-+            ok;
-+        Err ->
-+            Err
-     end.
- 
- do_close(#state{socket = undefined})            ->  ok;
-+do_close(#state{socket = Sock,