summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-12-20 07:12:27 +0000
committerSascha Schumann <sas@php.net>1999-12-20 07:12:27 +0000
commit0d70a91b6d7034a729bfc48f52b4955439b26a64 (patch)
tree8a024256d38194755d7d1c5a4118cddae2bb6a06
parent56a5e84f9ddbf2d63e34c797746124c5385306d4 (diff)
downloadphp-git-0d70a91b6d7034a729bfc48f52b4955439b26a64.tar.gz
Add information about chosen SAPI module to phpinfo()
-rw-r--r--build-defs.h.in1
-rw-r--r--ext/standard/info.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/build-defs.h.in b/build-defs.h.in
index fd9f697597..dc4ba19016 100644
--- 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 fcc350756b..6dcf0450eb 100644
--- 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");