BUILD: report zlib support in haproxy -vv

Compression algorithms are not always supported depending on build options.
"haproxy -vv" now reports if zlib is supported and lists compression algorithms
also supported.

diff --git a/src/compression.c b/src/compression.c
index 983e77136c37534bfeab94f0de191c5d76e56f86..300a0bd40841b1746f35e8dd5d8c80b61842ce92 100644 (file)
--- a/src/compression.c
+++ b/src/compression.c
@@ -50,7 +50,7 @@ static long long zlib_memory_available = -1;
 #endif
 
 
-static const struct comp_algo comp_algos[] =
+const struct comp_algo comp_algos[] =
 {
        { "identity", 8, identity_init, identity_add_data, identity_flush, identity_reset, identity_end },
 #ifdef USE_ZLIB

diff --git a/src/haproxy.c b/src/haproxy.c
index cfd6f84396e5f99a4fdf7c4b4cc77f093e37d732..d973ae282eb05dc98c3d1e6302e3b071f9426033 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -101,6 +101,8 @@
 
 /*********************************************************************/
 
+extern const struct comp_algo comp_algos[];
+
 /*********************************************************************/
 
 /* list of config files */
@@ -225,6 +227,24 @@ void display_build_opts()
 #endif
                "\n");
 
+#ifdef USE_ZLIB
+       printf("Built with zlib version : " ZLIB_VERSION "\n");
+#else /* USE_ZLIB */
+       printf("Built without zlib support (USE_ZLIB not set)\n");
+#endif
+       printf("Compression algorithms supported :");
+       {
+               int i;
+
+               for (i = 0; comp_algos[i].name; i++) {
+                       printf("%s %s", (i == 0 ? "" : ","), comp_algos[i].name);
+               }
+               if (i == 0) {
+                       printf("none");
+               }
+       }
+       printf("\n");
+
 #ifdef USE_OPENSSL
        printf("Built with OpenSSL version : " OPENSSL_VERSION_TEXT "\n");
        printf("OpenSSL library supports TLS extensions : "