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

Conflicts:
	src/http_command.c

Added on two machines

diff --combined .cproject
index be8b449,be8b449..370e803
--- 1/.cproject
--- 2/.cproject
+++ b/.cproject
@@@ -22,7 -22,7 +22,7 @@@
                                        <folderInfo id="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082." name="/" resourcePath="">
                                                <toolChain id="cdt.managedbuild.toolchain.gnu.macosx.exe.debug.642779913" name="MacOSX GCC" superClass="cdt.managedbuild.toolchain.gnu.macosx.exe.debug">
                                                        <targetPlatform id="cdt.managedbuild.target.gnu.platform.macosx.exe.debug.206052691" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.macosx.exe.debug"/>
--                                                      <builder buildPath="${workspace_loc:/pazpar2.master/Debug}" id="cdt.managedbuild.target.gnu.builder.macosx.exe.debug.2009339594" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.macosx.exe.debug"/>
++                                                      <builder arguments="-k" buildPath="${workspace_loc:/pazpar2.master/Debug}" command="make" id="cdt.managedbuild.target.gnu.builder.macosx.exe.debug.2009339594" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.macosx.exe.debug"/>
                                                        <tool id="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.debug.937721886" name="MacOS X C Linker" superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.debug">
                                                                <inputType id="cdt.managedbuild.tool.macosx.c.linker.input.377427532" superClass="cdt.managedbuild.tool.macosx.c.linker.input">
                                                                        <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@@ -50,255 -50,255 +50,6 @@@
                                        </folderInfo>
                                </configuration>
                        </storageModule>
--                      <storageModule moduleId="scannerConfiguration">
--                              <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
--                              <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
--                                      <buildOutputProvider>
--                                              <openAction enabled="true" filePath=""/>
--                                              <parser enabled="true"/>
--                                      </buildOutputProvider>
--                                      <scannerInfoProvider id="specsFile">
--                                              <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
--                                              <parser enabled="true"/>
--                                      </scannerInfoProvider>
--                              </profile>
--                              <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
--                                      <buildOutputProvider>
--                                              <openAction enabled="true" filePath=""/>
--                                              <parser enabled="true"/>
--                                      </buildOutputProvider>
--                                      <scannerInfoProvider id="makefileGenerator">
--                                              <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
--                                              <parser enabled="true"/>
--                                      </scannerInfoProvider>
--                              </profile>
--                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
--                                      <buildOutputProvider>
--                                              <openAction enabled="true" filePath=""/>
--                                              <parser enabled="true"/>
--                                      </buildOutputProvider>
--                                      <scannerInfoProvider id="specsFile">
--                                              <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
--                                              <parser enabled="true"/>
--                                      </scannerInfoProvider>
--                              </profile>
--                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
--                                      <buildOutputProvider>
--                                              <openAction enabled="true" filePath=""/>
--                                              <parser enabled="true"/>
--                                      </buildOutputProvider>
--                                      <scannerInfoProvider id="specsFile">
--                                              <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
--                                              <parser enabled="true"/>
--                                      </scannerInfoProvider>
--                              </profile>
--                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
--                                      <buildOutputProvider>
--                                              <openAction enabled="true" filePath=""/>
--                                              <parser enabled="true"/>
--                                      </buildOutputProvider>
--                                      <scannerInfoProvider id="specsFile">
--                                              <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
--                                              <parser enabled="true"/>
--                                      </scannerInfoProvider>
--                              </profile>
--                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
--                                      <buildOutputProvider>
--                                              <openAction enabled="true" filePath=""/>
--                                              <parser enabled="true"/>
--                                      </buildOutputProvider>
--                                      <scannerInfoProvider id="specsFile">
--                                              <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
--                                              <parser enabled="true"/>
--                                      </scannerInfoProvider>
--                              </profile>
--                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
--                                      <buildOutputProvider>
--                                              <openAction enabled="true" filePath=""/>
--                                              <parser enabled="true"/>
--                                      </buildOutputProvider>
--                                      <scannerInfoProvider id="specsFile">
--                                              <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
--                                              <parser enabled="true"/>
--                                      </scannerInfoProvider>
--                              </profile>
--                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
--                                      <buildOutputProvider>
--                                              <openAction enabled="true" filePath=""/>
--                                              <parser enabled="true"/>
--                                      </buildOutputProvider>
--                                      <scannerInfoProvider id="specsFile">
--                                              <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
--                                              <parser enabled="true"/>
--                                      </scannerInfoProvider>
--                              </profile>
--                              <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082;cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082.;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug.2080175189;cdt.managedbuild.tool.gnu.c.compiler.input.1159745856">
--                                      <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
--                                      <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="makefileGenerator">
--                                                      <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                              </scannerConfigBuildInfo>
--                              <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.macosx.exe.release.397760623;cdt.managedbuild.config.macosx.exe.release.397760623.;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.release.479123096;cdt.managedbuild.tool.gnu.c.compiler.input.144338339">
--                                      <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
--                                      <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="makefileGenerator">
--                                                      <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                              </scannerConfigBuildInfo>
--                      </storageModule>
                        <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
                        <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
                </cconfiguration>
@@@ -346,255 -346,255 +97,6 @@@
                                        </folderInfo>
                                </configuration>
                        </storageModule>
--                      <storageModule moduleId="scannerConfiguration">
--                              <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
--                              <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
--                                      <buildOutputProvider>
--                                              <openAction enabled="true" filePath=""/>
--                                              <parser enabled="true"/>
--                                      </buildOutputProvider>
--                                      <scannerInfoProvider id="specsFile">
--                                              <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
--                                              <parser enabled="true"/>
--                                      </scannerInfoProvider>
--                              </profile>
--                              <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
--                                      <buildOutputProvider>
--                                              <openAction enabled="true" filePath=""/>
--                                              <parser enabled="true"/>
--                                      </buildOutputProvider>
--                                      <scannerInfoProvider id="makefileGenerator">
--                                              <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
--                                              <parser enabled="true"/>
--                                      </scannerInfoProvider>
--                              </profile>
--                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
--                                      <buildOutputProvider>
--                                              <openAction enabled="true" filePath=""/>
--                                              <parser enabled="true"/>
--                                      </buildOutputProvider>
--                                      <scannerInfoProvider id="specsFile">
--                                              <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
--                                              <parser enabled="true"/>
--                                      </scannerInfoProvider>
--                              </profile>
--                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
--                                      <buildOutputProvider>
--                                              <openAction enabled="true" filePath=""/>
--                                              <parser enabled="true"/>
--                                      </buildOutputProvider>
--                                      <scannerInfoProvider id="specsFile">
--                                              <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
--                                              <parser enabled="true"/>
--                                      </scannerInfoProvider>
--                              </profile>
--                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
--                                      <buildOutputProvider>
--                                              <openAction enabled="true" filePath=""/>
--                                              <parser enabled="true"/>
--                                      </buildOutputProvider>
--                                      <scannerInfoProvider id="specsFile">
--                                              <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
--                                              <parser enabled="true"/>
--                                      </scannerInfoProvider>
--                              </profile>
--                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
--                                      <buildOutputProvider>
--                                              <openAction enabled="true" filePath=""/>
--                                              <parser enabled="true"/>
--                                      </buildOutputProvider>
--                                      <scannerInfoProvider id="specsFile">
--                                              <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
--                                              <parser enabled="true"/>
--                                      </scannerInfoProvider>
--                              </profile>
--                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
--                                      <buildOutputProvider>
--                                              <openAction enabled="true" filePath=""/>
--                                              <parser enabled="true"/>
--                                      </buildOutputProvider>
--                                      <scannerInfoProvider id="specsFile">
--                                              <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
--                                              <parser enabled="true"/>
--                                      </scannerInfoProvider>
--                              </profile>
--                              <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
--                                      <buildOutputProvider>
--                                              <openAction enabled="true" filePath=""/>
--                                              <parser enabled="true"/>
--                                      </buildOutputProvider>
--                                      <scannerInfoProvider id="specsFile">
--                                              <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
--                                              <parser enabled="true"/>
--                                      </scannerInfoProvider>
--                              </profile>
--                              <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082;cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082.;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug.2080175189;cdt.managedbuild.tool.gnu.c.compiler.input.1159745856">
--                                      <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
--                                      <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="makefileGenerator">
--                                                      <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                              </scannerConfigBuildInfo>
--                              <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.macosx.exe.release.397760623;cdt.managedbuild.config.macosx.exe.release.397760623.;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.release.479123096;cdt.managedbuild.tool.gnu.c.compiler.input.144338339">
--                                      <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
--                                      <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="makefileGenerator">
--                                                      <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                                      <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
--                                              <buildOutputProvider>
--                                                      <openAction enabled="true" filePath=""/>
--                                                      <parser enabled="true"/>
--                                              </buildOutputProvider>
--                                              <scannerInfoProvider id="specsFile">
--                                                      <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
--                                                      <parser enabled="true"/>
--                                              </scannerInfoProvider>
--                                      </profile>
--                              </scannerConfigBuildInfo>
--                      </storageModule>
                        <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
                        <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
                </cconfiguration>
@@@ -602,4 -602,4 +104,47 @@@
        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
                <project id="pazpar2.master.cdt.managedbuild.target.macosx.exe.943143256" name="Executable" projectType="cdt.managedbuild.target.macosx.exe"/>
        </storageModule>
++      <storageModule moduleId="refreshScope" versionNumber="1">
++              <resource resourceType="PROJECT" workspacePath="/pazpar2"/>
++      </storageModule>
++      <storageModule moduleId="scannerConfiguration">
++              <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
++              <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
++                      <buildOutputProvider>
++                              <openAction enabled="true" filePath=""/>
++                              <parser enabled="true"/>
++                      </buildOutputProvider>
++                      <scannerInfoProvider id="makefileGenerator">
++                              <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
++                              <parser enabled="true"/>
++                      </scannerInfoProvider>
++              </profile>
++              <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082;cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082.;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug.2080175189;cdt.managedbuild.tool.gnu.c.compiler.input.1159745856">
++                      <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
++                      <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
++                              <buildOutputProvider>
++                                      <openAction enabled="true" filePath=""/>
++                                      <parser enabled="true"/>
++                              </buildOutputProvider>
++                              <scannerInfoProvider id="makefileGenerator">
++                                      <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
++                                      <parser enabled="true"/>
++                              </scannerInfoProvider>
++                      </profile>
++              </scannerConfigBuildInfo>
++              <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.macosx.exe.release.397760623;cdt.managedbuild.config.macosx.exe.release.397760623.;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.release.479123096;cdt.managedbuild.tool.gnu.c.compiler.input.144338339">
++                      <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
++                      <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
++                              <buildOutputProvider>
++                                      <openAction enabled="true" filePath=""/>
++                                      <parser enabled="true"/>
++                              </buildOutputProvider>
++                              <scannerInfoProvider id="makefileGenerator">
++                                      <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
++                                      <parser enabled="true"/>
++                              </scannerInfoProvider>
++                      </profile>
++              </scannerConfigBuildInfo>
++      </storageModule>
++      <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
  </cproject>

diff --combined .project
index abaaf39,abaaf39..6884081
--- 1/.project
--- 2/.project
+++ b/.project
@@@ -63,7 -63,7 +63,7 @@@
                                </dictionary>
                                <dictionary>
                                        <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
--                                      <value>true</value>
++                                      <value>false</value>
                                </dictionary>
                        </arguments>
                </buildCommand>

diff --combined src/http_command.c
index d6c762d,8ba4b15..d4970a4
--- 1/src/http_command.c
--- 2/src/http_command.c
+++ b/src/http_command.c
@@@ -509,7 -509,7 +509,7 @@@ static void cmd_settings(struct http_ch
      release_session(c, s);
  }
  
 -static void cmd_termlist(struct http_channel *c)
 +static void termlist_response(struct http_channel *c)
  {
      struct http_request *rq = c->request;
      struct http_session *s = locate_session(c);
@@@ -518,11 -518,14 +518,11 @@@
      int num = 15;
      int status;
  
      if (nums)
          num = atoi(nums);
  
 +    status = session_active_clients(s->psession);
 +
      response_open_no_status(c, "termlist");
      wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", status);
  
@@@ -532,45 -535,6 +532,45 @@@
      release_session(c, s);
  }
  
 +static void termlist_result_ready(void *data)
 +{
 +    struct http_channel *c = (struct http_channel) data;
 +    termlist_response(c);
 +}
 +
 +static void cmd_termlist(struct http_channel *c)
 +{
 +    struct http_request *rq = c->request;
 +    struct http_response *rs = c->response;
 +    struct http_session *s = locate_session(c);
 +    const char *block = http_argbyname(rq, "block");
 +    int active_clients;
 +    if (!s)
 +        return;
 +
 +    active_clients = session_active_clients(s->psession);
 +
 +    if (block && !strcmp("1", block) && active_clients)
 +    {
 +        // if there is already a watch/block. we do not block this one
 +        if (session_set_watch(s->psession, SESSION_WATCH_TERMLIST,
 +                              termlist_result_ready, c, c) != 0)
 +        {
 +            yaz_log(YLOG_WARN, "Attempt to block multiple times on termlist block. Not supported!");
 +            error(rs, PAZPAR2_ALREADY_BLOCKED, "termlist");
 +        }
 +        else
 +        {
 +            yaz_log(c->http_sessions->log_level, "%p Session %u: Blocking on command termlist", s, s->session_id);
 +        }
 +        release_session(c, s);
 +        return;
 +    }
 +
 +    termlist_response(c);
 +    release_session(c, s);
 +}
 +
  size_t session_get_memory_status(struct session *session);
  
  static void session_status(struct http_channel *c, struct http_session *s)
@@@ -690,7 -654,7 +690,7 @@@ static void bytarget_response(struct ht
  static void bytarget_result_ready(void *data)
  {
      struct http_channel *c = (struct http_channel *) data;
-     yaz_log(YLOG_DEBUG, "bytarget watch released");
+     yaz_log(c->http_sessions->log_level, "bytarget watch released");
      bytarget_response(c);
  }
  
@@@ -701,14 -665,11 +701,14 @@@ static void cmd_bytarget(struct http_ch
      struct http_response *rs = c->response;
      struct http_session *s = locate_session(c);
      const char *block = http_argbyname(rq, "block");
 +    int no_active;
  
      if (!s)
          return;
  
 -    if (block && strcmp("1",block) == 0)
 +    no_active = session_active_clients(s->psession);
 +
 +    if (block && !strcmp("1",block) && no_active)
      {
          // if there is already a watch/block. we do not block this one
          if (session_set_watch(s->psession, SESSION_WATCH_BYTARGET,