Merge branch 'master' into graceful_stop

diff --git a/IDMETA b/IDMETA
index 57d71fa..e47d376 100644 (file)
--- a/IDMETA
+++ b/IDMETA
@@ -1,3 +1,3 @@
 DEBIAN_DIST="wheezy squeeze"
 UBUNTU_DIST="oneiric natty maverick lucid"
-VERSION=1.3.31
+VERSION=1.3.32

diff --git a/NEWS b/NEWS
index d836e2e..5ac28d7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+--- 1.3.32 2012/04/24
+
+sru_z3950 filter passes through incoming Z39.50 requests again. Was
+not handled by mistake in Metaproxy versions 1.3.29, 1.3.30 and 1.3.31.
+
 --- 1.3.31 2012/04/24
 
 zoom: fixes for retry/proxy failover logic. More logging.

diff --git a/debian/changelog b/debian/changelog
index 6c4069c..e92777a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+metaproxy (1.3.32-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 24 Apr 2012 15:04:51 +0200
+
 metaproxy (1.3.31-1indexdata) unstable; urgency=low
 
   * Upstream.

diff --git a/src/filter_sru_to_z3950.cpp b/src/filter_sru_to_z3950.cpp
index 75c0da4..09b48b1 100644 (file)
--- a/src/filter_sru_to_z3950.cpp
+++ b/src/filter_sru_to_z3950.cpp
@@ -424,6 +424,10 @@ void yf::SRUtoZ3950::Impl::process(mp::Package &package)
             m_cond_url_ready.notify_all();
         }
     }
+    else
+    {
+        package.move();
+    }
     release_frontend(package);
 }
 

diff --git a/win/makefile b/win/makefile
index 4f51520..91672cd 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -7,7 +7,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.3.31
+VERSION=1.3.32
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz