sniper Mon Dec 5 21:28:42 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/sapi/aolserver aolserver.c
/php-src/sapi/apache php_apache.c
/php-src/sapi/apache2filter php_functions.c
/php-src/sapi/apache2handler php_functions.c
/php-src/sapi/apache_hooks php_apache.c
/php-src/sapi/continuity capi.c
/php-src/sapi/milter php_milter.c
/php-src/sapi/nsapi nsapi.c
Log:
MFH: nuke php3 legacy
http://cvs.php.net/diff.php/php-src/sapi/aolserver/aolserver.c?r1=1.81&r2=1.81.2.1&ty=u
Index: php-src/sapi/aolserver/aolserver.c
diff -u php-src/sapi/aolserver/aolserver.c:1.81
php-src/sapi/aolserver/aolserver.c:1.81.2.1
--- php-src/sapi/aolserver/aolserver.c:1.81 Wed Aug 3 10:08:45 2005
+++ php-src/sapi/aolserver/aolserver.c Mon Dec 5 21:28:39 2005
@@ -22,7 +22,7 @@
* - CGI/1.1 conformance
*/
-/* $Id: aolserver.c,v 1.81 2005/08/03 14:08:45 sniper Exp $ */
+/* $Id: aolserver.c,v 1.81.2.1 2005/12/06 02:28:39 sniper 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.81 2005/08/03 14:08:45 sniper Exp $");
+ php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v
1.81.2.1 2005/12/06 02:28:39 sniper 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());
@@ -240,7 +240,7 @@
PHP_FUNCTION(getallheaders);
-static function_entry aolserver_functions[] = {
+static zend_function_entry aolserver_functions[] = {
PHP_FE(getallheaders, NULL)
{NULL, NULL, NULL}
};
http://cvs.php.net/diff.php/php-src/sapi/apache/php_apache.c?r1=1.89.2.1&r2=1.89.2.2&ty=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.89.2.1
php-src/sapi/apache/php_apache.c:1.89.2.2
--- php-src/sapi/apache/php_apache.c:1.89.2.1 Mon Dec 5 20:14:01 2005
+++ php-src/sapi/apache/php_apache.c Mon Dec 5 21:28:39 2005
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.89.2.1 2005/12/06 01:14:01 sniper Exp $ */
+/* $Id: php_apache.c,v 1.89.2.2 2005/12/06 02:28:39 sniper Exp $ */
#include "php_apache_http.h"
@@ -51,7 +51,7 @@
PHP_MINFO_FUNCTION(apache);
-function_entry apache_functions[] = {
+zend_function_entry apache_functions[] = {
PHP_FE(virtual,
NULL)
PHP_FE(apache_request_headers, NULL)
PHP_FE(apache_note,
NULL)
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/php_functions.c?r1=1.44&r2=1.44.2.1&ty=u
Index: php-src/sapi/apache2filter/php_functions.c
diff -u php-src/sapi/apache2filter/php_functions.c:1.44
php-src/sapi/apache2filter/php_functions.c:1.44.2.1
--- php-src/sapi/apache2filter/php_functions.c:1.44 Wed Aug 3 10:08:46 2005
+++ php-src/sapi/apache2filter/php_functions.c Mon Dec 5 21:28:41 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_functions.c,v 1.44 2005/08/03 14:08:46 sniper Exp $ */
+/* $Id: php_functions.c,v 1.44.2.1 2005/12/06 02:28:41 sniper Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -355,7 +355,7 @@
php_info_print_table_end();
}
-static function_entry apache_functions[] = {
+static zend_function_entry apache_functions[] = {
PHP_FE(apache_lookup_uri, NULL)
PHP_FE(virtual, NULL)
PHP_FE(apache_request_headers, NULL)
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/php_functions.c?r1=1.18&r2=1.18.2.1&ty=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.18
php-src/sapi/apache2handler/php_functions.c:1.18.2.1
--- php-src/sapi/apache2handler/php_functions.c:1.18 Wed Aug 3 10:08:48 2005
+++ php-src/sapi/apache2handler/php_functions.c Mon Dec 5 21:28:41 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_functions.c,v 1.18 2005/08/03 14:08:48 sniper Exp $ */
+/* $Id: php_functions.c,v 1.18.2.1 2005/12/06 02:28:41 sniper Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -462,7 +462,7 @@
}
}
-static function_entry apache_functions[] = {
+static zend_function_entry apache_functions[] = {
PHP_FE(apache_lookup_uri, NULL)
PHP_FE(virtual, NULL)
PHP_FE(apache_request_headers, NULL)
http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/php_apache.c?r1=1.19.2.1&r2=1.19.2.2&ty=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.19.2.1
php-src/sapi/apache_hooks/php_apache.c:1.19.2.2
--- php-src/sapi/apache_hooks/php_apache.c:1.19.2.1 Mon Dec 5 20:14:01 2005
+++ php-src/sapi/apache_hooks/php_apache.c Mon Dec 5 21:28:41 2005
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.19.2.1 2005/12/06 01:14:01 sniper Exp $ */
+/* $Id: php_apache.c,v 1.19.2.2 2005/12/06 02:28:41 sniper Exp $ */
#include "php_apache_http.h"
@@ -60,7 +60,7 @@
PHP_MINFO_FUNCTION(apache);
-function_entry apache_functions[] = {
+zend_function_entry apache_functions[] = {
PHP_FE(virtual,
NULL)
PHP_FE(apache_request_headers, NULL)
PHP_FE(apache_note,
NULL)
@@ -1286,7 +1286,7 @@
/* {{{ php_apache_request_class_functions
*/
-static function_entry php_apache_request_class_functions[] = {
+static zend_function_entry php_apache_request_class_functions[] = {
/* string slots */
PHP_FALIAS(args,
apache_request_args, NULL)
PHP_FALIAS(boundary,
apache_request_boundary, NULL)
http://cvs.php.net/diff.php/php-src/sapi/continuity/capi.c?r1=1.11&r2=1.11.2.1&ty=u
Index: php-src/sapi/continuity/capi.c
diff -u php-src/sapi/continuity/capi.c:1.11
php-src/sapi/continuity/capi.c:1.11.2.1
--- php-src/sapi/continuity/capi.c:1.11 Wed Aug 3 10:08:49 2005
+++ php-src/sapi/continuity/capi.c Mon Dec 5 21:28:41 2005
@@ -80,7 +80,7 @@
PHP_FUNCTION(continuity_request_headers);
PHP_FUNCTION(continuity_response_headers);
-function_entry continuity_functions[] = {
+zend_function_entry continuity_functions[] = {
{NULL, NULL, NULL}
};
@@ -110,7 +110,7 @@
PHP_MINFO_FUNCTION(continuity)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Continuity Module Revision", "$Revision:
1.11 $");
+ php_info_print_table_row(2, "Continuity Module Revision", "$Revision:
1.11.2.1 $");
php_info_print_table_row(2, "Server Version", conFget_build());
#ifdef CONTINUITY_CDPEXT
php_info_print_table_row(2,"CDP Extensions", "enabled");
http://cvs.php.net/diff.php/php-src/sapi/milter/php_milter.c?r1=1.14&r2=1.14.2.1&ty=u
Index: php-src/sapi/milter/php_milter.c
diff -u php-src/sapi/milter/php_milter.c:1.14
php-src/sapi/milter/php_milter.c:1.14.2.1
--- php-src/sapi/milter/php_milter.c:1.14 Wed Aug 3 07:12:19 2005
+++ php-src/sapi/milter/php_milter.c Mon Dec 5 21:28:41 2005
@@ -748,7 +748,7 @@
/* {{{ milter_functions[]
*/
-static function_entry milter_functions[] = {
+static zend_function_entry milter_functions[] = {
PHP_FE(smfi_setflags, NULL)
PHP_FE(smfi_settimeout, NULL)
PHP_FE(smfi_getsymval, NULL)
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.1&r2=1.69.2.2&ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.1 php-src/sapi/nsapi/nsapi.c:1.69.2.2
--- php-src/sapi/nsapi/nsapi.c:1.69.2.1 Mon Dec 5 20:14:01 2005
+++ php-src/sapi/nsapi/nsapi.c Mon Dec 5 21:28:41 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: nsapi.c,v 1.69.2.1 2005/12/06 01:14:01 sniper Exp $ */
+/* $Id: nsapi.c,v 1.69.2.2 2005/12/06 02:28:41 sniper Exp $ */
/*
* PHP includes
@@ -174,7 +174,7 @@
*
* Every user visible function must have an entry in nsapi_functions[].
*/
-function_entry nsapi_functions[] = {
+zend_function_entry nsapi_functions[] = {
PHP_FE(nsapi_virtual, NULL)
/* Make subrequest */
PHP_FALIAS(virtual, nsapi_virtual, NULL)
/* compatibility */
PHP_FE(nsapi_request_headers, NULL)
/* get request headers */
@@ -310,7 +310,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, "NSAPI Module Revision", "$Revision:
1.69.2.1 $");
+ php_info_print_table_row(2, "NSAPI Module Revision", "$Revision:
1.69.2.2 $");
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" );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
