PHPC-663: Add SSL/SASL support to phpinfo() output

Author: derickr

config.m4

@@ -367,6 +367,7 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
     PHP_SETUP_OPENSSL(MONGODB_SHARED_LIBADD)
     MONGOC_ENABLE_SSL=1
     AC_SUBST(MONGOC_ENABLE_SSL)
+    AC_DEFINE(HAVE_MONGOC_SSL, 1, "Whether SSL is enabled in the bundled libmongoc")
   fi
 
 
@@ -419,6 +420,7 @@ if test "$PHP_MONGODB_SASL" != "no"; then
       PHP_ADD_LIBRARY_WITH_PATH(sasl2, $MONGODB_SASL_DIR/$PHP_LIBDIR, MONGODB_SHARED_LIBADD)
       MONGOC_ENABLE_SASL=1
       AC_SUBST(MONGOC_ENABLE_SASL)
+      AC_DEFINE(HAVE_MONGOC_SASL, 1, "Whether SASL is enabled in the bundled libmongoc")
     ], [
       if test "$MONGODB_SASL" != "auto"; then
         AC_MSG_ERROR([MONGO SASL check failed. Please check config.log for more information.])

config.w32

@@ -25,8 +25,11 @@ if (PHP_MONGODB != "no") {
 
   if (!CHECK_LIB("libsasl.lib", "mongodb", PHP_MONGODB)) {
 	  WARNING("mongodb libsasl support not enabled, libs not found");
+  } else {
+    AC_DEFINE("HAVE_MONGOC_SASL", 1);
   }
   if (CHECK_LIB("ssleay32.lib", "mongodb", PHP_MONGODB) && CHECK_LIB("libeay32.lib", "mongodb", PHP_MONGODB) && CHECK_HEADER_ADD_INCLUDE("openssl/ssl.h", "CFLAGS_MONGOC")) {
+    AC_DEFINE("HAVE_MONGOC_SSL", 1);
   }
 
   FSO.CopyFile(configure_module_dirname + "/win32/bson-config.h", configure_module_dirname + "/src/libbson/src/bson/bson-config.h", true);

php_phongo.c

@@ -2583,6 +2583,16 @@ PHP_MINFO_FUNCTION(mongodb)
 #else
 	/* Bundled libraries, buildtime = runtime */
 	php_info_print_table_row(2, "libmongoc version", MONGOC_VERSION_S);
+# if HAVE_MONGOC_SSL
+	php_info_print_table_row(2, "libmongoc SSL support", "yes");
+# else
+	php_info_print_table_row(2, "libmongoc SSL support", "no");
+# endif
+# if HAVE_MONGOC_SASL
+	php_info_print_table_row(2, "libmongoc SASL support", "yes");
+# else
+	php_info_print_table_row(2, "libmongoc SASL support", "no");
+# endif
 #endif
 #ifdef HAVE_SYSTEM_LIBBSON
 	php_info_print_table_row(2, "libbson headers version", BSON_VERSION_S);