From: Dennis Schafroth Date: Wed, 6 Apr 2011 10:18:35 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 X-Git-Tag: v1.5.6~7^2 X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=b870d31e2a380260faf8b85ff6b54d5fe775f882;hp=a768cf2deb0154265ca27faa634c4c0e9e76939d;p=pazpar2-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 Conflicts: src/eventl.c --- diff --git a/etc/dads-pz2.xsl b/etc/dads-pz2.xsl index 553ab20..6f151f9 100644 --- a/etc/dads-pz2.xsl +++ b/etc/dads-pz2.xsl @@ -73,6 +73,17 @@ + + + + + + + + + + + diff --git a/src/client.c b/src/client.c index 9990dd0..89858d6 100644 --- a/src/client.c +++ b/src/client.c @@ -787,6 +787,7 @@ void client_lock(struct client *c) void client_unlock(struct client *c) { yaz_mutex_leave(c->mutex); + sleep(1); } void client_incref(struct client *c)