lib-http: Create http-common.h, which contains global definitions shared by client...

Currently contains only the default HTTP port definitions that used to be
private to the client.

diff --git a/src/lib-http/Makefile.am b/src/lib-http/Makefile.am
index 241d5622639c349c357d440ecd4691032a1ee58d..2df2bb9c78ba0fc1345e907c9d328c7f02d38d89 100644 (file)
--- a/src/lib-http/Makefile.am
+++ b/src/lib-http/Makefile.am
@@ -32,6 +32,7 @@ libhttp_la_SOURCES = \
        http-server.c
 
 headers = \
+       http-common.h \
        http-date.h \
        http-url.h \
        http-parser.h \

diff --git a/src/lib-http/http-client-private.h b/src/lib-http/http-client-private.h
index cd218c0ccc508ead77dd88c21cc1304ec5422fb4..efb838382fc5abe2d55b55bbd27dc31434de744a 100644 (file)
--- a/src/lib-http/http-client-private.h
+++ b/src/lib-http/http-client-private.h
@@ -10,9 +10,6 @@
  * Defaults
  */
 
-#define HTTP_DEFAULT_PORT 80
-#define HTTPS_DEFAULT_PORT 443
-
 #define HTTP_CLIENT_CONTINUE_TIMEOUT_MSECS (1000*2)
 #define HTTP_CLIENT_DEFAULT_REQUEST_TIMEOUT_MSECS (1000*60*1)
 #define HTTP_CLIENT_DEFAULT_DNS_LOOKUP_TIMEOUT_MSECS (1000*10)

diff --git a/src/lib-http/http-client.c b/src/lib-http/http-client.c
index 0a028c14df21ab6cedecd15497d3f6e82f0cc3ba..1c4f89ad4e4b2940bd43759379e49b173b535a8a 100644 (file)
--- a/src/lib-http/http-client.c
+++ b/src/lib-http/http-client.c
@@ -17,9 +17,6 @@
 
 #include "http-client-private.h"
 
-#define HTTP_DEFAULT_PORT 80
-#define HTTPS_DEFAULT_PORT 443
-
 /* Structure:
 
    http_client_context:

diff --git a/src/lib-http/http-client.h b/src/lib-http/http-client.h
index 26fd0a90570b664d62769a44230caa531fae420f..7c530f504962ce7062535c96cdd2ad5a1efd329c 100644 (file)
--- a/src/lib-http/http-client.h
+++ b/src/lib-http/http-client.h
@@ -3,6 +3,7 @@
 
 #include "net.h"
 
+#include "http-common.h"
 #include "http-response.h"
 
 struct timeval;

diff --git a/src/lib-http/http-common.h b/src/lib-http/http-common.h
new file mode 100644 (file)
index 0000000..9aa217f
--- /dev/null
+++ b/src/lib-http/http-common.h
@@ -0,0 +1,7 @@
+#ifndef HTTP_COMMON_H
+#define HTTP_COMMON_H
+
+#define HTTP_DEFAULT_PORT 80
+#define HTTPS_DEFAULT_PORT 443
+
+#endif

diff --git a/src/lib-http/http-server.h b/src/lib-http/http-server.h
index eadc799f0fc4386ac55ed2679413638cfcb522c5..6a94b38f8e89193bdf081a07cd17892298ba17d4 100644 (file)
--- a/src/lib-http/http-server.h
+++ b/src/lib-http/http-server.h
@@ -1,6 +1,7 @@
 #ifndef HTTP_SERVER_H
 #define HTTP_SERVER_H
 
+#include "http-common.h"
 #include "http-auth.h"
 #include "http-request.h"