Add information about chosen SAPI module to phpinfo()

diff --git a/build-defs.h.in b/build-defs.h.in
index fd9f69759708a417fe9fb2d1444818f4366a7ae4..dc4ba190163c5bc1998a4a2d2fd1c628d13c43fa 100644 (file)
--- a/build-defs.h.in
+++ b/build-defs.h.in
@@ -74,6 +74,7 @@
 #define PHP_PGSQL_LIBS         ""
 #define PHP_PROG_SENDMAIL      "@PROG_SENDMAIL@"
 #define PHP_REGEX_LIB          ""
+#define PHP_SAPI                       "@PHP_SAPI@"
 #define PHP_SOLID_INCLUDE      ""
 #define PHP_SOLID_LIBS         ""
 #define PHP_EMPRESS_INCLUDE    ""

diff --git a/ext/standard/info.c b/ext/standard/info.c
index fcc350756bde0c861f6b67339f9712e885ca8842..6dcf0450ebf6b5496e70c6061d876989b4d886ac 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -100,6 +100,7 @@ PHPAPI void php_print_info(int flag)
 #endif
                php_printf("php.ini path:  %s<br>\n", CONFIGURATION_FILE_PATH);
                php_printf("ZEND_DEBUG=%d<br>\n", ZEND_DEBUG);
+               php_printf("SAPI=" PHP_SAPI "<br>\n");
 #ifdef ZTS
                php_printf("ZTS is defined");
 #else
@@ -313,6 +314,7 @@ void php_print_credits(int flag)
                CREDIT_LINE("AOLserver SAPI Module", "Sascha Schumann");
                CREDIT_LINE("Servlet SAPI Module", "Sam Ruby");
                CREDIT_LINE("Roxen SAPI Module", "David Hedbor");
+               CREDIT_LINE("thttpd SAPI Module", "Sascha Schumann");
                CREDIT_LINE("Overall Work", "Thies C. Arntzen, Stig Bakken, Shane Caraveo, \
                                        Rasmus Lerdorf, Sascha Schumann, Zeev Suraski, Andrei Zmievski, \
                                        and others");