Use sapi_module_struct to contain SAPI module name

diff --git a/ext/standard/info.c b/ext/standard/info.c
index c9ddbcb4794a8e9c52449cd7745a4d78b5d46ad4..69a9d2791c2346db13a2119d252f5254152159c8 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -100,7 +100,8 @@ 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");*/
+               if (sapi_module.name)
+                       php_printf("SAPI=%s<br>\n", sapi_module.name);
 #ifdef ZTS
                php_printf("ZTS is defined");
 #else

diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index 0575799b8d2a8d1235a48cb97b9db42e1fa0a88f..2814e9e046fb20b1e73bd268a43593bef01b4b40 100644 (file)
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -291,7 +291,7 @@ php_ns_startup(sapi_module_struct *sapi_module)
 /* this structure is static (as in "it does not change") */
 
 static sapi_module_struct sapi_module = {
-       "PHP Language",
+       "AOLserver",
 
        php_ns_startup,                                                 /* startup */
        php_module_shutdown_wrapper,                    /* shutdown */

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 39ec0014282bbca568f18c36013de1ce2c8e7191..1d54931e5e8966fd724a09fef91552171a6ceeb2 100644 (file)
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -212,7 +212,7 @@ int sapi_apache_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
 
 
 sapi_module_struct sapi_module = {
-       "PHP Language",                                 /* name */
+       "Apache",                                               /* name */
                                                                        
        php_module_startup,                             /* startup */
        php_module_shutdown_wrapper,    /* shutdown */

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index f117a4f99bae846df7c58cebc701e0e6e911630c..99ba4858b7baead85c0caa4bf0d7faf32661c2ea 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -121,7 +121,7 @@ static char *sapi_cgi_read_cookies(SLS_D)
 
 
 static sapi_module_struct sapi_module = {
-       "PHP Language",                                 /* name */
+       "CGI",                                                  /* name */
                                                                        
        php_module_startup,                             /* startup */
        php_module_shutdown_wrapper,    /* shutdown */

diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c
index 1fbb41382e892bdaaacbfa3b12681b083fb3f562..83416f3ffbf32e582bb19bd9b24eb20cc2e5b6be 100644 (file)
--- a/sapi/isapi/php4isapi.c
+++ b/sapi/isapi/php4isapi.c
@@ -291,7 +291,7 @@ static char *sapi_isapi_read_cookies(SLS_D)
 
 
 static sapi_module_struct sapi_module = {
-       "PHP Language",                                 /* name */
+       "ISAPI",                                                /* name */
                                                                        
        php_isapi_startup,                              /* startup */
        php_module_shutdown_wrapper,    /* shutdown */

diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index 1ec54f31381192c96eabb76486843116c1105f26..2903d14dde222c8a3e9bb1fb5054bd66d5c09880 100644 (file)
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -505,7 +505,7 @@ static int php_roxen_startup(sapi_module_struct *sapi_module)
 void pike_module_exit(void);
 
 static sapi_module_struct sapi_module = {
-  "PHP Language",
+  "Roxen",
 
   php_module_startup,                                          /* startup */
   pike_module_exit,                    /* shutdown */

diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index 4b7ac7b307eadecf377bd162f9774114b2177519..5c7e03e7958d67590c6c999ac24f3214a21c186e 100644 (file)
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -210,7 +210,7 @@ static char *sapi_servlet_read_cookies(SLS_D)
  */
 
 static sapi_module_struct sapi_module = {
-       "PHP Language",                                 /* name */
+       "Java Servlet",                                 /* name */
                                                                        
        php_module_startup,                             /* startup */
        php_module_shutdown_wrapper,    /* shutdown */

diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c
index c3ac2c5e7fd882d02cf6348f532cf2a6d8f3d622..b62fa2a965b289923a6e255f6b36ea9a9559e6fc 100644 (file)
--- a/sapi/thttpd/thttpd.c
+++ b/sapi/thttpd/thttpd.c
@@ -102,7 +102,7 @@ static char *sapi_thttpd_read_cookies(SLS_D)
 }
 
 static sapi_module_struct sapi_module = {
-       "PHP Language",
+       "thttpd",
        
        php_module_startup,
        php_module_shutdown_wrapper,