Add test case for bug #3260 (settings mixed)

[pazpar2-moved-to-github.git] / src / pazpar2_config.h

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 9b57167..1ae1ee4 100644 (file)
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -23,7 +23,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "normalize_cache.h"
 
 #include <yaz/nmem.h>
+#include <yaz/mutex.h>
 #include "charsets.h"
+#include "http.h"
 
 enum conf_metadata_type {
     Metadata_type_generic,    // Generic text field
@@ -97,6 +99,7 @@ struct conf_server;
 // however, only a single service is possible.
 struct conf_service
 {
+    YAZ_MUTEX mutex;
     int num_metadata;
     struct conf_metadata *metadata;
     int num_sortkeys;
@@ -132,8 +135,6 @@ struct conf_server
     char *proxy_host;
     int proxy_port;
     char *myurl;
-    struct sockaddr_in *proxy_addr;
-    int listener_socket;
     char *server_settings;
     char *server_id;
 
@@ -143,6 +144,7 @@ struct conf_server
     struct conf_service *service;
     struct conf_server *next;
     struct conf_config *config;
+    http_server_t http_server;
 };
 
 struct conf_targetprofiles