rasmus Mon Dec 20 14:33:41 2004 EDT
Modified files:
/php-src/sapi/aolserver aolserver.c
/php-src/sapi/apache2handler mod_php5.c
/php-src/sapi/apache_hooks mod_php5.c
/php-src/sapi/caudium caudium.c
/php-src/sapi/cgi cgi_main.c
/php-src/sapi/cli php_cli.c
/php-src/sapi/continuity capi.c
/php-src/sapi/embed php_embed.c
/php-src/sapi/isapi php5isapi.c
/php-src/sapi/milter php_milter.c
/php-src/sapi/nsapi nsapi.c
/php-src/sapi/phttpd phttpd.c
/php-src/sapi/pi3web pi3web_sapi.c
/php-src/sapi/roxen roxen.c
/php-src/sapi/thttpd thttpd.c
/php-src/sapi/tux php_tux.c
/php-src/sapi/webjames webjames.c
Log:
Add the new request_time sapi struct entry to all the sapis. Some of these
may have ways of getting the request time without the extra syscall, but
for now let's just make sure we don't crash and people will eventually
fill these in where applicable.
http://cvs.php.net/diff.php/php-src/sapi/aolserver/aolserver.c?r1=1.77&r2=1.78&ty=u
Index: php-src/sapi/aolserver/aolserver.c
diff -u php-src/sapi/aolserver/aolserver.c:1.77
php-src/sapi/aolserver/aolserver.c:1.78
--- php-src/sapi/aolserver/aolserver.c:1.77 Thu Jan 8 03:18:02 2004
+++ php-src/sapi/aolserver/aolserver.c Mon Dec 20 14:33:35 2004
@@ -22,7 +22,7 @@
* - CGI/1.1 conformance
*/
-/* $Id: aolserver.c,v 1.77 2004/01/08 08:18:02 andi Exp $ */
+/* $Id: aolserver.c,v 1.78 2004/12/20 19:33:35 rasmus Exp $ */
/* conflict between PHP and AOLserver headers */
#define Debug php_Debug
@@ -205,7 +205,7 @@
int i;
php_info_print_table_start();
- php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v
1.77 2004/01/08 08:18:02 andi Exp $");
+ php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v
1.78 2004/12/20 19:33:35 rasmus 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());
@@ -385,6 +385,7 @@
php_ns_sapi_register_variables,
NULL,
/* Log message */
+ NULL,
/* Get request time */
STANDARD_SAPI_MODULE_PROPERTIES
};
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/mod_php5.c?r1=1.3&r2=1.4&ty=u
Index: php-src/sapi/apache2handler/mod_php5.c
diff -u php-src/sapi/apache2handler/mod_php5.c:1.3
php-src/sapi/apache2handler/mod_php5.c:1.4
--- php-src/sapi/apache2handler/mod_php5.c:1.3 Thu Jan 8 03:18:05 2004
+++ php-src/sapi/apache2handler/mod_php5.c Mon Dec 20 14:33:36 2004
@@ -18,10 +18,10 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.3 2004/01/08 08:18:05 andi Exp $ */
+/* $Id: mod_php5.c,v 1.4 2004/12/20 19:33:36 rasmus Exp $ */
+
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
-#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
-
#include "php.h"
#include "php_apache.h"
http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/mod_php5.c?r1=1.5&r2=1.6&ty=u
Index: php-src/sapi/apache_hooks/mod_php5.c
diff -u php-src/sapi/apache_hooks/mod_php5.c:1.5
php-src/sapi/apache_hooks/mod_php5.c:1.6
--- php-src/sapi/apache_hooks/mod_php5.c:1.5 Mon Jul 19 03:19:50 2004
+++ php-src/sapi/apache_hooks/mod_php5.c Mon Dec 20 14:33:36 2004
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.5 2004/07/19 07:19:50 andi Exp $ */
+/* $Id: mod_php5.c,v 1.6 2004/12/20 19:33:36 rasmus Exp $ */
#include "php_apache_http.h"
@@ -529,6 +529,7 @@
sapi_apache_register_server_variables, /* register server
variables */
php_apache_log_message, /* Log message */
+ NULL, /* Get request
time */
NULL, /* php.ini path
override */
http://cvs.php.net/diff.php/php-src/sapi/caudium/caudium.c?r1=1.33&r2=1.34&ty=u
Index: php-src/sapi/caudium/caudium.c
diff -u php-src/sapi/caudium/caudium.c:1.33 php-src/sapi/caudium/caudium.c:1.34
--- php-src/sapi/caudium/caudium.c:1.33 Sat Jan 17 08:00:10 2004
+++ php-src/sapi/caudium/caudium.c Mon Dec 20 14:33:36 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: caudium.c,v 1.33 2004/01/17 13:00:10 sniper Exp $ */
+/* $Id: caudium.c,v 1.34 2004/12/20 19:33:36 rasmus Exp $ */
#include "php.h"
#ifdef HAVE_CAUDIUM
@@ -444,7 +444,7 @@
{
/* char buf[512]; */
php_info_print_table_start();
- php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.33
2004/01/17 13:00:10 sniper Exp $");
+ php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.34
2004/12/20 19:33:36 rasmus 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());
@@ -550,6 +550,7 @@
php_caudium_sapi_read_cookies, /* read cookies */
sapi_caudium_register_variables, /* register server variables */
NULL, /* Log message */
+ NULL, /* Get request time */
STANDARD_SAPI_MODULE_PROPERTIES
};
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.256&r2=1.257&ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.256 php-src/sapi/cgi/cgi_main.c:1.257
--- php-src/sapi/cgi/cgi_main.c:1.256 Wed Jul 14 18:30:27 2004
+++ php-src/sapi/cgi/cgi_main.c Mon Dec 20 14:33:37 2004
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.256 2004/07/14 22:30:27 edink Exp $ */
+/* $Id: cgi_main.c,v 1.257 2004/12/20 19:33:37 rasmus Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -539,6 +539,7 @@
sapi_cgi_register_variables, /* register server variables */
sapi_cgi_log_message, /* Log message */
+ NULL, /* Get request
time */
STANDARD_SAPI_MODULE_PROPERTIES
};
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.114&r2=1.115&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.114 php-src/sapi/cli/php_cli.c:1.115
--- php-src/sapi/cli/php_cli.c:1.114 Mon Nov 15 09:00:48 2004
+++ php-src/sapi/cli/php_cli.c Mon Dec 20 14:33:38 2004
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.114 2004/11/15 14:00:48 tony2001 Exp $ */
+/* $Id: php_cli.c,v 1.115 2004/12/20 19:33:38 rasmus Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -342,6 +342,7 @@
sapi_cli_register_variables, /* register server variables */
sapi_cli_log_message, /* Log message */
+ NULL, /* Get request
time */
STANDARD_SAPI_MODULE_PROPERTIES
};
http://cvs.php.net/diff.php/php-src/sapi/continuity/capi.c?r1=1.9&r2=1.10&ty=u
Index: php-src/sapi/continuity/capi.c
diff -u php-src/sapi/continuity/capi.c:1.9 php-src/sapi/continuity/capi.c:1.10
--- php-src/sapi/continuity/capi.c:1.9 Tue Jun 22 14:08:03 2004
+++ php-src/sapi/continuity/capi.c Mon Dec 20 14:33:38 2004
@@ -110,7 +110,7 @@
PHP_MINFO_FUNCTION(continuity)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Continuity Module Revision", "$Revision:
1.9 $");
+ php_info_print_table_row(2, "Continuity Module Revision", "$Revision:
1.10 $");
php_info_print_table_row(2, "Server Version", conFget_build());
#ifdef CONTINUITY_CDPEXT
php_info_print_table_row(2,"CDP Extensions", "enabled");
@@ -378,6 +378,7 @@
sapi_capi_register_server_variables, /* register server variables */
capi_log_message, /* Log message */
+ NULL, /* Get request time */
NULL, /* Block interruptions */
NULL, /* Unblock interruptions */
http://cvs.php.net/diff.php/php-src/sapi/embed/php_embed.c?r1=1.8&r2=1.9&ty=u
Index: php-src/sapi/embed/php_embed.c
diff -u php-src/sapi/embed/php_embed.c:1.8 php-src/sapi/embed/php_embed.c:1.9
--- php-src/sapi/embed/php_embed.c:1.8 Thu Jan 8 03:18:11 2004
+++ php-src/sapi/embed/php_embed.c Mon Dec 20 14:33:39 2004
@@ -15,7 +15,7 @@
| Author: Edin Kadribasic <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_embed.c,v 1.8 2004/01/08 08:18:11 andi Exp $ */
+/* $Id: php_embed.c,v 1.9 2004/12/20 19:33:39 rasmus Exp $ */
#include "php_embed.h"
@@ -125,6 +125,7 @@
php_embed_register_variables, /* register server variables */
php_embed_log_message, /* Log message */
+ NULL, /* Get request
time */
STANDARD_SAPI_MODULE_PROPERTIES
};
http://cvs.php.net/diff.php/php-src/sapi/isapi/php5isapi.c?r1=1.5&r2=1.6&ty=u
Index: php-src/sapi/isapi/php5isapi.c
diff -u php-src/sapi/isapi/php5isapi.c:1.5 php-src/sapi/isapi/php5isapi.c:1.6
--- php-src/sapi/isapi/php5isapi.c:1.5 Fri Dec 17 22:14:39 2004
+++ php-src/sapi/isapi/php5isapi.c Mon Dec 20 14:33:39 2004
@@ -16,7 +16,7 @@
| Ben Mansell <[EMAIL PROTECTED]> (Zeus Support)
|
+----------------------------------------------------------------------+
*/
-/* $Id: php5isapi.c,v 1.5 2004/12/18 03:14:39 sniper Exp $ */
+/* $Id: php5isapi.c,v 1.6 2004/12/20 19:33:39 rasmus Exp $ */
#include "php.h"
#include <httpext.h>
@@ -669,7 +669,8 @@
sapi_isapi_read_cookies, /* read Cookies */
sapi_isapi_register_server_variables, /* register server variables */
- NULL,
/* Log message */
+ NULL, /* Log message
*/
+ NULL, /* Get request
time */
STANDARD_SAPI_MODULE_PROPERTIES
};
http://cvs.php.net/diff.php/php-src/sapi/milter/php_milter.c?r1=1.12&r2=1.13&ty=u
Index: php-src/sapi/milter/php_milter.c
diff -u php-src/sapi/milter/php_milter.c:1.12
php-src/sapi/milter/php_milter.c:1.13
--- php-src/sapi/milter/php_milter.c:1.12 Thu Apr 29 08:59:23 2004
+++ php-src/sapi/milter/php_milter.c Mon Dec 20 14:33:39 2004
@@ -846,6 +846,7 @@
sapi_milter_register_variables, /* register server variables */
NULL, /* Log message
*/
+ NULL, /* Get request
time */
NULL, /* Block
interruptions */
NULL, /* Unblock
interruptions */
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.65&r2=1.66&ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.65 php-src/sapi/nsapi/nsapi.c:1.66
--- php-src/sapi/nsapi/nsapi.c:1.65 Mon Sep 20 09:30:13 2004
+++ php-src/sapi/nsapi/nsapi.c Mon Dec 20 14:33:39 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: nsapi.c,v 1.65 2004/09/20 13:30:13 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.66 2004/12/20 19:33:39 rasmus Exp $ */
/*
* PHP includes
@@ -310,7 +310,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.65
$");
+ php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.66
$");
php_info_print_table_row(2, "Server Software", system_version());
php_info_print_table_row(2, "Sub-requests with nsapi_virtual()",
(nsapi_servact_service)?((zend_ini_long("zlib.output_compression",
sizeof("zlib.output_compression"), 0))?"not supported with
zlib.output_compression":"enabled"):"not supported on this platform" );
@@ -743,6 +743,7 @@
sapi_nsapi_register_server_variables, /* register server variables */
nsapi_log_message, /* Log message */
+ NULL,
/* Get request time */
NULL, /* Block interruptions */
NULL, /* Unblock interruptions */
http://cvs.php.net/diff.php/php-src/sapi/phttpd/phttpd.c?r1=1.39&r2=1.40&ty=u
Index: php-src/sapi/phttpd/phttpd.c
diff -u php-src/sapi/phttpd/phttpd.c:1.39 php-src/sapi/phttpd/phttpd.c:1.40
--- php-src/sapi/phttpd/phttpd.c:1.39 Thu Jan 8 03:18:15 2004
+++ php-src/sapi/phttpd/phttpd.c Mon Dec 20 14:33:39 2004
@@ -179,6 +179,7 @@
NULL,
/* register server variables */
NULL,
/* Log message */
+ NULL,
/* Get request time */
STANDARD_SAPI_MODULE_PROPERTIES
};
http://cvs.php.net/diff.php/php-src/sapi/pi3web/pi3web_sapi.c?r1=1.58&r2=1.59&ty=u
Index: php-src/sapi/pi3web/pi3web_sapi.c
diff -u php-src/sapi/pi3web/pi3web_sapi.c:1.58
php-src/sapi/pi3web/pi3web_sapi.c:1.59
--- php-src/sapi/pi3web/pi3web_sapi.c:1.58 Sun Dec 5 04:52:25 2004
+++ php-src/sapi/pi3web/pi3web_sapi.c Mon Dec 20 14:33:39 2004
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pi3web_sapi.c,v 1.58 2004/12/05 09:52:25 holger Exp $ */
+/* $Id: pi3web_sapi.c,v 1.59 2004/12/20 19:33:39 rasmus Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -57,7 +57,7 @@
PUTS("<table border=0 cellpadding=3 cellspacing=1 width=600
align=center>\n");
PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR "\">Pi3Web Server
Information</th></tr>\n");
php_info_print_table_header(2, "Information Field", "Value");
- php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id:
pi3web_sapi.c,v 1.58 2004/12/05 09:52:25 holger Exp $");
+ php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id:
pi3web_sapi.c,v 1.59 2004/12/20 19:33:39 rasmus Exp $");
php_info_print_table_row(2, "Server Name Stamp",
HTTPCore_getServerStamp());
snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled());
php_info_print_table_row(2, "Debug Enabled", variable_buf);
@@ -336,6 +336,7 @@
sapi_pi3web_read_cookies, /* read Cookies */
sapi_pi3web_register_variables, /* register server variables */
NULL, /* Log message */
+ NULL, /* Get request time */
STANDARD_SAPI_MODULE_PROPERTIES
};
http://cvs.php.net/diff.php/php-src/sapi/roxen/roxen.c?r1=1.59&r2=1.60&ty=u
Index: php-src/sapi/roxen/roxen.c
diff -u php-src/sapi/roxen/roxen.c:1.59 php-src/sapi/roxen/roxen.c:1.60
--- php-src/sapi/roxen/roxen.c:1.59 Sat Jan 17 08:00:15 2004
+++ php-src/sapi/roxen/roxen.c Mon Dec 20 14:33:40 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: roxen.c,v 1.59 2004/01/17 13:00:15 sniper Exp $ */
+/* $Id: roxen.c,v 1.60 2004/12/20 19:33:40 rasmus Exp $ */
#include "php.h"
#ifdef HAVE_ROXEN
@@ -438,7 +438,7 @@
{
/* char buf[512]; */
php_info_print_table_start();
- php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.59
2004/01/17 13:00:15 sniper Exp $");
+ php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.60
2004/12/20 19:33:40 rasmus 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());
@@ -501,6 +501,7 @@
php_roxen_sapi_read_cookies, /* read Cookies */
NULL, /* register server variables */
NULL, /* Log message */
+ NULL, /* Get request time */
STANDARD_SAPI_MODULE_PROPERTIES
};
http://cvs.php.net/diff.php/php-src/sapi/thttpd/thttpd.c?r1=1.92&r2=1.93&ty=u
Index: php-src/sapi/thttpd/thttpd.c
diff -u php-src/sapi/thttpd/thttpd.c:1.92 php-src/sapi/thttpd/thttpd.c:1.93
--- php-src/sapi/thttpd/thttpd.c:1.92 Thu Jan 8 03:18:18 2004
+++ php-src/sapi/thttpd/thttpd.c Mon Dec 20 14:33:40 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: thttpd.c,v 1.92 2004/01/08 08:18:18 andi Exp $ */
+/* $Id: thttpd.c,v 1.93 2004/12/20 19:33:40 rasmus Exp $ */
#include "php.h"
#include "SAPI.h"
@@ -393,6 +393,7 @@
sapi_thttpd_register_variables,
NULL,
/* Log message */
+ NULL,
/* Get request time */
NULL,
/* php.ini path override */
NULL,
/* Block interruptions */
http://cvs.php.net/diff.php/php-src/sapi/tux/php_tux.c?r1=1.23&r2=1.24&ty=u
Index: php-src/sapi/tux/php_tux.c
diff -u php-src/sapi/tux/php_tux.c:1.23 php-src/sapi/tux/php_tux.c:1.24
--- php-src/sapi/tux/php_tux.c:1.23 Thu Jan 8 03:18:19 2004
+++ php-src/sapi/tux/php_tux.c Mon Dec 20 14:33:40 2004
@@ -287,6 +287,7 @@
sapi_tux_register_variables,
NULL,
/* Log message */
+ NULL,
/* Get request time */
STANDARD_SAPI_MODULE_PROPERTIES
};
http://cvs.php.net/diff.php/php-src/sapi/webjames/webjames.c?r1=1.9&r2=1.10&ty=u
Index: php-src/sapi/webjames/webjames.c
diff -u php-src/sapi/webjames/webjames.c:1.9
php-src/sapi/webjames/webjames.c:1.10
--- php-src/sapi/webjames/webjames.c:1.9 Thu Jan 8 03:18:20 2004
+++ php-src/sapi/webjames/webjames.c Mon Dec 20 14:33:41 2004
@@ -277,6 +277,7 @@
sapi_webjames_register_variables, /* register server variables */
NULL,
/* Log message */
+ NULL,
/* Get request time */
STANDARD_SAPI_MODULE_PROPERTIES
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
