From: Dennis Schafroth <dennis@indexdata.com>
Date: Thu, 3 Nov 2011 14:15:24 +0000 (+0100)
Subject: Merge branch 'bytarget_block' of ssh://git.indexdata.com/home/git/pub/pazpar2 into... 
X-Git-Tag: mobile-beta-1~25
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=f795b401c5145f9a4d56e919908cc71931074667;hp=-c;p=pazpar2-moved-to-github.git

Merge branch 'bytarget_block' of ssh://git.indexdata.com/home/git/pub/pazpar2 into bytarget_block
---

f795b401c5145f9a4d56e919908cc71931074667
diff --combined src/http_command.c
index fc292bd,8ba4b15..c016dde
--- a/src/http_command.c
+++ b/src/http_command.c
@@@ -654,7 -654,7 +654,7 @@@ static void bytarget_response(struct ht
  static void bytarget_result_ready(void *data)
  {
      struct http_channel *c = (struct http_channel *) data;
- 
+     yaz_log(c->http_sessions->log_level, "bytarget watch released");
      bytarget_response(c);
  }
  
@@@ -669,7 -669,7 +669,7 @@@ static void cmd_bytarget(struct http_ch
      if (!s)
          return;
  
 -    if (block && strcmp("1",block) == 0)
 +    if (block && !strcmp("1",block))
      {
          // if there is already a watch/block. we do not block this one
          if (session_set_watch(s->psession, SESSION_WATCH_BYTARGET,