The Resource For PHP Developers

php4-beta | 199912

[PHP4BETA] cvs: /php4/ext/standard info.c /php4/sapi/aolserver aolserver.c /php4/sapi/apache mod_php4.c /php4/sapi/cgi cgi_main.c /php4/sapi/isapi php4isapi.c /php4/sapi/roxen roxen.c /php4/sapi/servlet servlet.c /php4/sapi/thttpd thttpd.c From: Sascha Schumann (sascha <email protected>)
Date: 12/20/99

Next message: Morten Hulden: "Re: [PHP4BETA] Current CVS does not compile"
Previous message: Allen Lee: "Re: [PHP4BETA] Searching a MySQL DB..."
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

sas Mon Dec 20 18:10:25 1999 EDT

  Modified files:
    /php4/ext/standard info.c
    /php4/sapi/aolserver aolserver.c
    /php4/sapi/apache mod_php4.c
    /php4/sapi/cgi cgi_main.c
    /php4/sapi/isapi php4isapi.c
    /php4/sapi/roxen roxen.c
    /php4/sapi/servlet servlet.c
    /php4/sapi/thttpd thttpd.c
  Log:
  Use sapi_module_struct to contain SAPI module name


Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.53 php4/ext/standard/info.c:1.54
--- php4/ext/standard/info.c:1.53 Mon Dec 20 10:38:44 1999
+++ php4/ext/standard/info.c Mon Dec 20 18:09:49 1999
@@ -100,7 +100,8 @@
#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
Index: php4/sapi/aolserver/aolserver.c
diff -u php4/sapi/aolserver/aolserver.c:1.24 php4/sapi/aolserver/aolserver.c:1.25
--- php4/sapi/aolserver/aolserver.c:1.24 Thu Dec 16 12:07:19 1999
+++ php4/sapi/aolserver/aolserver.c Mon Dec 20 18:09:50 1999
@@ -22,7 +22,7 @@
  * - CGI/1.1 conformance
  */

-/* $Id: aolserver.c,v 1.24 1999/12/16 17:07:19 sas Exp $ */
+/* $Id: aolserver.c,v 1.25 1999/12/20 23:09:50 sas Exp $ */

/* conflict between PHP and AOLserver headers */
#define Debug php_Debug
@@ -206,7 +206,7 @@
         NSLS_FETCH();

         PUTS("<table border=5 width=600>\n");
- php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.24 1999/12/16 17:07:19 sas Exp $");
+ php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.25 1999/12/20 23:09:50 sas Exp $");
         php_info_print_table_row(2, "Build date", Ns_InfoBuildDate());
         php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile());
         php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog());
@@ -291,7 +291,7 @@
/* 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 */
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.7 php4/sapi/apache/mod_php4.c:1.8
--- php4/sapi/apache/mod_php4.c:1.7 Fri Dec 17 09:24:39 1999
+++ php4/sapi/apache/mod_php4.c Mon Dec 20 18:09:50 1999
@@ -17,7 +17,7 @@
    | PHP 4.0 patches by Zeev Suraski <zeev <email protected>> |
    +----------------------------------------------------------------------+
  */
-/* $Id: mod_php4.c,v 1.7 1999/12/17 14:24:39 sas Exp $ */
+/* $Id: mod_php4.c,v 1.8 1999/12/20 23:09:50 sas Exp $ */

#include "zend.h"
#include "php.h"
@@ -212,7 +212,7 @@

sapi_module_struct sapi_module = {
- "PHP Language", /* name */
+ "Apache", /* name */

         php_module_startup, /* startup */
         php_module_shutdown_wrapper, /* shutdown */
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.11 php4/sapi/cgi/cgi_main.c:1.12
--- php4/sapi/cgi/cgi_main.c:1.11 Fri Dec 17 14:51:37 1999
+++ php4/sapi/cgi/cgi_main.c Mon Dec 20 18:09:51 1999
@@ -121,7 +121,7 @@

static sapi_module_struct sapi_module = {
- "PHP Language", /* name */
+ "CGI", /* name */

         php_module_startup, /* startup */
         php_module_shutdown_wrapper, /* shutdown */
Index: php4/sapi/isapi/php4isapi.c
diff -u php4/sapi/isapi/php4isapi.c:1.6 php4/sapi/isapi/php4isapi.c:1.7
--- php4/sapi/isapi/php4isapi.c:1.6 Sat Dec 4 08:25:40 1999
+++ php4/sapi/isapi/php4isapi.c Mon Dec 20 18:09:52 1999
@@ -291,7 +291,7 @@

static sapi_module_struct sapi_module = {
- "PHP Language", /* name */
+ "ISAPI", /* name */

         php_isapi_startup, /* startup */
         php_module_shutdown_wrapper, /* shutdown */
Index: php4/sapi/roxen/roxen.c
diff -u php4/sapi/roxen/roxen.c:1.6 php4/sapi/roxen/roxen.c:1.7
--- php4/sapi/roxen/roxen.c:1.6 Sat Dec 4 08:25:41 1999
+++ php4/sapi/roxen/roxen.c Mon Dec 20 18:09:52 1999
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */

-/* $Id: roxen.c,v 1.6 1999/12/04 13:25:41 zeev Exp $ */
+/* $Id: roxen.c,v 1.7 1999/12/20 23:09:52 sas Exp $ */

#include "php.h"
#ifdef HAVE_ROXEN
@@ -458,7 +458,7 @@
   char buf[512];

   PUTS("<table border=5 width=600>\n");
- php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.6 1999/12/04 13:25:41 zeev Exp $");
+ php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.7 1999/12/20 23:09:52 sas Exp $");
   /* php_info_print_table_row(2, "Build date", Ns_InfoBuildDate());
       php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile());
       php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog());
@@ -505,7 +505,7 @@
void pike_module_exit(void);

static sapi_module_struct sapi_module = {
- "PHP Language",
+ "Roxen",

   php_module_startup, /* startup */
   pike_module_exit, /* shutdown */
Index: php4/sapi/servlet/servlet.c
diff -u php4/sapi/servlet/servlet.c:1.7 php4/sapi/servlet/servlet.c:1.8
--- php4/sapi/servlet/servlet.c:1.7 Fri Dec 17 14:51:39 1999
+++ php4/sapi/servlet/servlet.c Mon Dec 20 18:09:53 1999
@@ -210,7 +210,7 @@
  */

static sapi_module_struct sapi_module = {
- "PHP Language", /* name */
+ "Java Servlet", /* name */

         php_module_startup, /* startup */
         php_module_shutdown_wrapper, /* shutdown */
Index: php4/sapi/thttpd/thttpd.c
diff -u php4/sapi/thttpd/thttpd.c:1.1 php4/sapi/thttpd/thttpd.c:1.2
--- php4/sapi/thttpd/thttpd.c:1.1 Mon Dec 20 02:11:14 1999
+++ php4/sapi/thttpd/thttpd.c Mon Dec 20 18:09:54 1999
@@ -102,7 +102,7 @@
}

static sapi_module_struct sapi_module = {
- "PHP Language",
+ "thttpd",

         php_module_startup,
         php_module_shutdown_wrapper,

-- 
PHP 4.0 Beta Mailing List <http://www.php.net/version4/>
To unsubscribe, e-mail: php4beta-unsubscribe <email protected>
For additional commands, e-mail: php4beta-help <email protected>
To contact the list administrators, e-mail: php4beta-admin <email protected>

Next message: Morten Hulden: "Re: [PHP4BETA] Current CVS does not compile"
Previous message: Allen Lee: "Re: [PHP4BETA] Searching a MySQL DB..."
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Find a programming school near you

php4-beta | 199912