sniper Fri Mar 7 00:15:29 2003 EDT
Modified files:
/ZendEngine2 zend_ini.c zend_ini.h
/php4/ext/fam fam.c
/php4/ext/fbsql php_fbsql.c
/php4/ext/hwapi hwapi.cpp
/php4/ext/hyperwave hw.c
/php4/ext/informix ifx.ec
/php4/ext/ingres_ii ii.c
/php4/ext/interbase interbase.c
/php4/ext/ircg ircg.c
/php4/ext/ldap ldap.c
/php4/ext/mbstring mbstring.c
/php4/ext/mssql php_mssql.c
/php4/ext/mysql php_mysql.c
/php4/ext/mysqli mysqli.c
/php4/ext/ncurses ncurses.c
/php4/ext/odbc php_odbc.c
/php4/ext/pfpro pfpro.c
/php4/ext/pgsql pgsql.c
/php4/ext/session session.c
/php4/ext/skeleton skeleton.c
/php4/ext/standard assert.c file.c
/php4/ext/sybase_ct php_sybase_ct.c
/php4/ext/sysvmsg sysvmsg.c
/php4/ext/tokenizer tokenizer.c
/php4/ext/yaz php_yaz.c
/php4/ext/zlib zlib.c
/php4/main main.c
/php4/netware phplib.imp
/php4/sapi/apache php_apache.c
/php4/sapi/apache_hooks php_apache.c
/php4/scripts/ext_skel_ng extension_parser.php
Log:
Renamed OnUpdateInt -> OnUpdateLong to prevent further misunderstandings.
# Intentionally left out any 'alias' for it, this way 3rd party extension
# maintainers will really NOTICE the change.
Index: ZendEngine2/zend_ini.c
diff -u ZendEngine2/zend_ini.c:1.28 ZendEngine2/zend_ini.c:1.29
--- ZendEngine2/zend_ini.c:1.28 Fri Jan 31 20:49:14 2003
+++ ZendEngine2/zend_ini.c Fri Mar 7 00:15:08 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_ini.c,v 1.28 2003/02/01 01:49:14 sniper Exp $ */
+/* $Id: zend_ini.c,v 1.29 2003/03/07 05:15:08 sniper Exp $ */
#include "zend.h"
#include "zend_qsort.h"
@@ -436,7 +436,7 @@
}
-ZEND_API ZEND_INI_MH(OnUpdateInt)
+ZEND_API ZEND_INI_MH(OnUpdateLong)
{
long *p;
#ifndef ZTS
Index: ZendEngine2/zend_ini.h
diff -u ZendEngine2/zend_ini.h:1.26 ZendEngine2/zend_ini.h:1.27
--- ZendEngine2/zend_ini.h:1.26 Fri Jan 31 20:49:14 2003
+++ ZendEngine2/zend_ini.h Fri Mar 7 00:15:08 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_ini.h,v 1.26 2003/02/01 01:49:14 sniper Exp $ */
+/* $Id: zend_ini.h,v 1.27 2003/03/07 05:15:08 sniper Exp $ */
#ifndef ZEND_INI_H
#define ZEND_INI_H
@@ -172,7 +172,7 @@
/* Standard message handlers */
ZEND_API ZEND_INI_MH(OnUpdateBool);
-ZEND_API ZEND_INI_MH(OnUpdateInt);
+ZEND_API ZEND_INI_MH(OnUpdateLong);
ZEND_API ZEND_INI_MH(OnUpdateReal);
ZEND_API ZEND_INI_MH(OnUpdateString);
ZEND_API ZEND_INI_MH(OnUpdateStringUnempty);
Index: php4/ext/fam/fam.c
diff -u php4/ext/fam/fam.c:1.2 php4/ext/fam/fam.c:1.3
--- php4/ext/fam/fam.c:1.2 Tue Dec 31 11:06:34 2002
+++ php4/ext/fam/fam.c Fri Mar 7 00:15:09 2003
@@ -15,7 +15,7 @@
| Author: Sascha Schumann <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: fam.c,v 1.2 2002/12/31 16:06:34 sebastian Exp $
+ $Id: fam.c,v 1.3 2003/03/07 05:15:09 sniper Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -83,7 +83,7 @@
*/
/* Remove comments and fill if you need to have entries in php.ini
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("fam.global_value", "42", PHP_INI_ALL, OnUpdateInt,
global_value, zend_fam_globals, fam_globals)
+ STD_PHP_INI_ENTRY("fam.global_value", "42", PHP_INI_ALL, OnUpdateLong,
global_value, zend_fam_globals, fam_globals)
STD_PHP_INI_ENTRY("fam.global_string", "foobar", PHP_INI_ALL, OnUpdateString,
global_string, zend_fam_globals, fam_globals)
PHP_INI_END()
*/
Index: php4/ext/fbsql/php_fbsql.c
diff -u php4/ext/fbsql/php_fbsql.c:1.94 php4/ext/fbsql/php_fbsql.c:1.95
--- php4/ext/fbsql/php_fbsql.c:1.94 Thu Mar 6 15:31:15 2003
+++ php4/ext/fbsql/php_fbsql.c Fri Mar 7 00:15:09 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_fbsql.c,v 1.94 2003/03/06 20:31:15 sesser Exp $ */
+/* $Id: php_fbsql.c,v 1.95 2003/03/07 05:15:09 sniper Exp $ */
/* TODO:
*
@@ -358,14 +358,14 @@
/* {{{ PHP_INI
*/
PHP_INI_BEGIN()
- STD_PHP_INI_BOOLEAN ("fbsql.allow_persistent", "1",
PHP_INI_SYSTEM, OnUpdateInt, allowPersistent, zend_fbsql_globals,
fbsql_globals)
- STD_PHP_INI_BOOLEAN ("fbsql.generate_warnings", "0",
PHP_INI_SYSTEM, OnUpdateInt, generateWarnings, zend_fbsql_globals,
fbsql_globals)
- STD_PHP_INI_BOOLEAN ("fbsql.autocommit",
"1", PHP_INI_SYSTEM, OnUpdateInt, autoCommit,
zend_fbsql_globals, fbsql_globals)
- STD_PHP_INI_ENTRY_EX ("fbsql.max_persistent", "-1",
PHP_INI_SYSTEM, OnUpdateInt, maxPersistent, zend_fbsql_globals,
fbsql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX ("fbsql.max_links",
"128", PHP_INI_SYSTEM, OnUpdateInt, maxLinks, zend_fbsql_globals,
fbsql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX ("fbsql.max_connections", "128",
PHP_INI_SYSTEM, OnUpdateInt, maxConnections, zend_fbsql_globals,
fbsql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX ("fbsql.max_results",
"128", PHP_INI_SYSTEM, OnUpdateInt, maxResults, zend_fbsql_globals,
fbsql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX ("fbsql.batchSize",
"1000", PHP_INI_SYSTEM, OnUpdateInt, batchSize,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
+ STD_PHP_INI_BOOLEAN ("fbsql.allow_persistent", "1",
PHP_INI_SYSTEM, OnUpdateLong, allowPersistent, zend_fbsql_globals,
fbsql_globals)
+ STD_PHP_INI_BOOLEAN ("fbsql.generate_warnings", "0",
PHP_INI_SYSTEM, OnUpdateLong, generateWarnings, zend_fbsql_globals,
fbsql_globals)
+ STD_PHP_INI_BOOLEAN ("fbsql.autocommit",
"1", PHP_INI_SYSTEM, OnUpdateLong, autoCommit,
zend_fbsql_globals, fbsql_globals)
+ STD_PHP_INI_ENTRY_EX ("fbsql.max_persistent", "-1",
PHP_INI_SYSTEM, OnUpdateLong, maxPersistent, zend_fbsql_globals,
fbsql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX ("fbsql.max_links",
"128", PHP_INI_SYSTEM, OnUpdateLong, maxLinks,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX ("fbsql.max_connections", "128",
PHP_INI_SYSTEM, OnUpdateLong, maxConnections, zend_fbsql_globals,
fbsql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX ("fbsql.max_results",
"128", PHP_INI_SYSTEM, OnUpdateLong, maxResults,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX ("fbsql.batchSize",
"1000", PHP_INI_SYSTEM, OnUpdateLong, batchSize,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
STD_PHP_INI_ENTRY ("fbsql.default_host",
NULL, PHP_INI_SYSTEM, OnUpdateString, hostName, zend_fbsql_globals,
fbsql_globals)
STD_PHP_INI_ENTRY ("fbsql.default_user",
"_SYSTEM", PHP_INI_SYSTEM, OnUpdateString, userName, zend_fbsql_globals,
fbsql_globals)
STD_PHP_INI_ENTRY ("fbsql.default_password", "",
PHP_INI_SYSTEM, OnUpdateString, userPassword, zend_fbsql_globals,
fbsql_globals)
Index: php4/ext/hwapi/hwapi.cpp
diff -u php4/ext/hwapi/hwapi.cpp:1.7 php4/ext/hwapi/hwapi.cpp:1.8
--- php4/ext/hwapi/hwapi.cpp:1.7 Thu Feb 13 02:59:23 2003
+++ php4/ext/hwapi/hwapi.cpp Fri Mar 7 00:15:09 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hwapi.cpp,v 1.7 2003/02/13 07:59:23 steinm Exp $ */
+/* $Id: hwapi.cpp,v 1.8 2003/03/07 05:15:09 sniper Exp $ */
#include <stdlib.h>
#include <errno.h>
@@ -2162,7 +2162,7 @@
}
PHP_INI_BEGIN()
-// STD_PHP_INI_ENTRY("hwapi.allow_persistent", "0", PHP_INI_SYSTEM, OnUpdateInt,
allow_persistent, zend_hwapi_globals, hwapi_globals)
+// STD_PHP_INI_ENTRY("hwapi.allow_persistent", "0", PHP_INI_SYSTEM, OnUpdateLong,
allow_persistent, zend_hwapi_globals, hwapi_globals)
PHP_INI_END()
PHP_MINIT_FUNCTION(hwapi) {
Index: php4/ext/hyperwave/hw.c
diff -u php4/ext/hyperwave/hw.c:1.120 php4/ext/hyperwave/hw.c:1.121
--- php4/ext/hyperwave/hw.c:1.120 Tue Mar 4 13:59:15 2003
+++ php4/ext/hyperwave/hw.c Fri Mar 7 00:15:10 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hw.c,v 1.120 2003/03/04 18:59:15 sniper Exp $ */
+/* $Id: hw.c,v 1.121 2003/03/07 05:15:10 sniper Exp $ */
#include <stdlib.h>
#include <errno.h>
@@ -217,7 +217,7 @@
}
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("hyperwave.allow_persistent", "0", PHP_INI_SYSTEM,
OnUpdateInt, allow_persistent, zend_hw_globals, hw_globals)
+ STD_PHP_INI_ENTRY("hyperwave.allow_persistent", "0", PHP_INI_SYSTEM,
OnUpdateLong, allow_persistent, zend_hw_globals, hw_globals)
PHP_INI_ENTRY("hyperwave.default_port", "418", PHP_INI_ALL,
OnHyperwavePort)
PHP_INI_END()
Index: php4/ext/informix/ifx.ec
diff -u php4/ext/informix/ifx.ec:1.88 php4/ext/informix/ifx.ec:1.89
--- php4/ext/informix/ifx.ec:1.88 Wed Mar 5 08:16:59 2003
+++ php4/ext/informix/ifx.ec Fri Mar 7 00:15:10 2003
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ifx.ec,v 1.88 2003/03/05 13:16:59 nobbie Exp $ */
+/* $Id: ifx.ec,v 1.89 2003/03/07 05:15:10 sniper Exp $ */
/* -------------------------------------------------------------------
* if you want a function reference : "grep '^\*\*' ifx.ec" will give
@@ -328,17 +328,17 @@
}
PHP_INI_BEGIN()
- STD_PHP_INI_BOOLEAN("ifx.allow_persistent", "1", PHP_INI_SYSTEM, OnUpdateInt,
allow_persistent, zend_ifx_globals, ifx_globals)
- STD_PHP_INI_ENTRY_EX("ifx.max_persistent", "-1", PHP_INI_SYSTEM, OnUpdateInt,
max_persistent, zend_ifx_globals, ifx_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX("ifx.max_links", "-1", PHP_INI_SYSTEM, OnUpdateInt,
max_links, zend_ifx_globals, ifx_globals, display_link_numbers)
+ STD_PHP_INI_BOOLEAN("ifx.allow_persistent", "1", PHP_INI_SYSTEM,
OnUpdateLong, allow_persistent, zend_ifx_globals, ifx_globals)
+ STD_PHP_INI_ENTRY_EX("ifx.max_persistent", "-1", PHP_INI_SYSTEM,
OnUpdateLong, max_persistent, zend_ifx_globals, ifx_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("ifx.max_links", "-1", PHP_INI_SYSTEM,
OnUpdateLong, max_links, zend_ifx_globals, ifx_globals, display_link_numbers)
STD_PHP_INI_ENTRY("ifx.default_host", NULL, PHP_INI_SYSTEM,
OnUpdateString, default_host, zend_ifx_globals, ifx_globals)
STD_PHP_INI_ENTRY("ifx.default_user", NULL, PHP_INI_SYSTEM,
OnUpdateString, default_user, zend_ifx_globals, ifx_globals)
STD_PHP_INI_ENTRY("ifx.default_password", NULL, PHP_INI_SYSTEM,
OnUpdateString, default_password, zend_ifx_globals, ifx_globals)
- STD_PHP_INI_ENTRY("ifx.blobinfile", "1", PHP_INI_ALL, OnUpdateInt,
blobinfile, zend_ifx_globals, ifx_globals)
- STD_PHP_INI_ENTRY("ifx.textasvarchar", "0", PHP_INI_ALL, OnUpdateInt,
textasvarchar, zend_ifx_globals, ifx_globals)
- STD_PHP_INI_ENTRY("ifx.byteasvarchar", "0", PHP_INI_ALL, OnUpdateInt,
byteasvarchar, zend_ifx_globals, ifx_globals)
- STD_PHP_INI_ENTRY("ifx.charasvarchar", "0", PHP_INI_ALL, OnUpdateInt,
charasvarchar, zend_ifx_globals, ifx_globals)
- STD_PHP_INI_ENTRY("ifx.nullformat", "0", PHP_INI_ALL, OnUpdateInt,
nullformat, zend_ifx_globals, ifx_globals)
+ STD_PHP_INI_ENTRY("ifx.blobinfile", "1", PHP_INI_ALL,
OnUpdateLong, blobinfile, zend_ifx_globals, ifx_globals)
+ STD_PHP_INI_ENTRY("ifx.textasvarchar", "0", PHP_INI_ALL,
OnUpdateLong, textasvarchar, zend_ifx_globals, ifx_globals)
+ STD_PHP_INI_ENTRY("ifx.byteasvarchar", "0", PHP_INI_ALL,
OnUpdateLong, byteasvarchar, zend_ifx_globals, ifx_globals)
+ STD_PHP_INI_ENTRY("ifx.charasvarchar", "0", PHP_INI_ALL,
OnUpdateLong, charasvarchar, zend_ifx_globals, ifx_globals)
+ STD_PHP_INI_ENTRY("ifx.nullformat", "0", PHP_INI_ALL,
OnUpdateLong, nullformat, zend_ifx_globals, ifx_globals)
PHP_INI_END()
static void php_ifx_init_globals(zend_ifx_globals *ifx_globals)
Index: php4/ext/ingres_ii/ii.c
diff -u php4/ext/ingres_ii/ii.c:1.36 php4/ext/ingres_ii/ii.c:1.37
--- php4/ext/ingres_ii/ii.c:1.36 Fri Feb 21 01:46:11 2003
+++ php4/ext/ingres_ii/ii.c Fri Mar 7 00:15:12 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ii.c,v 1.36 2003/02/21 06:46:11 sniper Exp $ */
+/* $Id: ii.c,v 1.37 2003/03/07 05:15:12 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -86,9 +86,9 @@
/* php.ini entries
*/
PHP_INI_BEGIN()
- STD_PHP_INI_BOOLEAN("ingres.allow_persistent", "1", PHP_INI_SYSTEM,
OnUpdateInt, allow_persistent, zend_ii_globals, ii_globals)
- STD_PHP_INI_ENTRY_EX("ingres.max_persistent", "-1", PHP_INI_SYSTEM,
OnUpdateInt, max_persistent, zend_ii_globals, ii_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX("ingres.max_links", "-1", PHP_INI_SYSTEM, OnUpdateInt,
max_links, zend_ii_globals, ii_globals, display_link_numbers)
+ STD_PHP_INI_BOOLEAN("ingres.allow_persistent", "1", PHP_INI_SYSTEM,
OnUpdateLong, allow_persistent, zend_ii_globals, ii_globals)
+ STD_PHP_INI_ENTRY_EX("ingres.max_persistent", "-1", PHP_INI_SYSTEM,
OnUpdateLong, max_persistent, zend_ii_globals, ii_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("ingres.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong,
max_links, zend_ii_globals, ii_globals, display_link_numbers)
STD_PHP_INI_ENTRY("ingres.default_database", NULL, PHP_INI_ALL,
OnUpdateString, default_database, zend_ii_globals, ii_globals)
STD_PHP_INI_ENTRY("ingres.default_user", NULL, PHP_INI_ALL, OnUpdateString,
default_user, zend_ii_globals, ii_globals)
STD_PHP_INI_ENTRY("ingres.default_password", NULL, PHP_INI_ALL,
OnUpdateString, default_password, zend_ii_globals, ii_globals)
Index: php4/ext/interbase/interbase.c
diff -u php4/ext/interbase/interbase.c:1.98 php4/ext/interbase/interbase.c:1.99
--- php4/ext/interbase/interbase.c:1.98 Sat Jan 18 14:41:52 2003
+++ php4/ext/interbase/interbase.c Fri Mar 7 00:15:12 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interbase.c,v 1.98 2003/01/18 19:41:52 iliaa Exp $ */
+/* $Id: interbase.c,v 1.99 2003/03/07 05:15:12 sniper Exp $ */
/* TODO: Arrays, roles?
@@ -502,9 +502,9 @@
/* {{{ startup, shutdown and info functions */
PHP_INI_BEGIN()
- STD_PHP_INI_BOOLEAN("ibase.allow_persistent", "1", PHP_INI_SYSTEM,
OnUpdateInt, allow_persistent, zend_ibase_globals, ibase_globals)
- STD_PHP_INI_ENTRY_EX("ibase.max_persistent", "-1", PHP_INI_SYSTEM,
OnUpdateInt, max_persistent, zend_ibase_globals, ibase_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX("ibase.max_links", "-1", PHP_INI_SYSTEM, OnUpdateInt,
max_links, zend_ibase_globals, ibase_globals, display_link_numbers)
+ STD_PHP_INI_BOOLEAN("ibase.allow_persistent", "1", PHP_INI_SYSTEM,
OnUpdateLong, allow_persistent, zend_ibase_globals, ibase_globals)
+ STD_PHP_INI_ENTRY_EX("ibase.max_persistent", "-1", PHP_INI_SYSTEM,
OnUpdateLong, max_persistent, zend_ibase_globals, ibase_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("ibase.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong,
max_links, zend_ibase_globals, ibase_globals, display_link_numbers)
STD_PHP_INI_ENTRY("ibase.default_user", NULL, PHP_INI_ALL, OnUpdateString,
default_user, zend_ibase_globals, ibase_globals)
STD_PHP_INI_ENTRY("ibase.default_password", NULL, PHP_INI_ALL,
OnUpdateString, default_password, zend_ibase_globals, ibase_globals)
STD_PHP_INI_ENTRY("ibase.timestampformat", "%m/%d/%Y %H:%M:%S", PHP_INI_ALL,
OnUpdateString, cfg_timestampformat, zend_ibase_globals, ibase_globals)
@@ -609,7 +609,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Interbase Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.98 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.99 $");
#ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, "Dynamic Module", "yes");
#endif
Index: php4/ext/ircg/ircg.c
diff -u php4/ext/ircg/ircg.c:1.164 php4/ext/ircg/ircg.c:1.165
--- php4/ext/ircg/ircg.c:1.164 Sat Jan 18 16:31:05 2003
+++ php4/ext/ircg/ircg.c Fri Mar 7 00:15:13 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ircg.c,v 1.164 2003/01/18 21:31:05 iliaa Exp $ */
+/* $Id: ircg.c,v 1.165 2003/03/07 05:15:13 sniper Exp $ */
/* {{{ includes */
@@ -215,7 +215,7 @@
PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("ircg.work_dir", "/tmp/ircg", PHP_INI_ALL, OnUpdateString,
work_dir, zend_ircg_globals, ircg_globals)
- STD_PHP_INI_ENTRY("ircg.shared_mem_size", "10000000", PHP_INI_ALL,
OnUpdateInt, shared_mem_size, zend_ircg_globals, ircg_globals)
+ STD_PHP_INI_ENTRY("ircg.shared_mem_size", "10000000", PHP_INI_ALL,
OnUpdateLong, shared_mem_size, zend_ircg_globals, ircg_globals)
STD_PHP_INI_ENTRY("ircg.control_user", "nobody", PHP_INI_ALL, OnUpdateString,
control_user, zend_ircg_globals, ircg_globals)
PHP_INI_END()
Index: php4/ext/ldap/ldap.c
diff -u php4/ext/ldap/ldap.c:1.135 php4/ext/ldap/ldap.c:1.136
--- php4/ext/ldap/ldap.c:1.135 Thu Mar 6 18:07:25 2003
+++ php4/ext/ldap/ldap.c Fri Mar 7 00:15:13 2003
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.135 2003/03/06 23:07:25 ddhill Exp $ */
+/* $Id: ldap.c,v 1.136 2003/03/07 05:15:13 sniper Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -200,7 +200,7 @@
/* {{{ PHP_INI_BEGIN
*/
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY_EX("ldap.max_links", "-1", PHP_INI_SYSTEM,
OnUpdateInt, max_links, zend_ldap_globals,
ldap_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("ldap.max_links", "-1", PHP_INI_SYSTEM,
OnUpdateLong, max_links, zend_ldap_globals,
ldap_globals, display_link_numbers)
PHP_INI_END()
/* }}} */
@@ -286,7 +286,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled" );
- php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.135 2003/03/06
23:07:25 ddhill Exp $" );
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.136 2003/03/07
05:15:13 sniper Exp $" );
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.167 php4/ext/mbstring/mbstring.c:1.168
--- php4/ext/mbstring/mbstring.c:1.167 Wed Mar 5 01:16:22 2003
+++ php4/ext/mbstring/mbstring.c Fri Mar 7 00:15:16 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.167 2003/03/05 06:16:22 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.168 2003/03/07 05:15:16 sniper Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -653,7 +653,7 @@
new_value_length = sizeof("1");
}
- OnUpdateInt(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3,
stage TSRMLS_CC);
+ OnUpdateLong(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3,
stage TSRMLS_CC);
if (MBSTRG(encoding_translation)){
_php_mb_enable_encoding_translation(1);
@@ -677,7 +677,7 @@
#endif /* ZEND_MULTIBYTE */
PHP_INI_ENTRY("mbstring.substitute_character", NULL, PHP_INI_ALL,
OnUpdate_mbstring_substitute_character)
STD_PHP_INI_ENTRY("mbstring.func_overload", "0", PHP_INI_SYSTEM |
- PHP_INI_PERDIR, OnUpdateInt, func_overload, zend_mbstring_globals,
mbstring_globals)
+ PHP_INI_PERDIR, OnUpdateLong, func_overload, zend_mbstring_globals,
mbstring_globals)
STD_PHP_INI_BOOLEAN("mbstring.encoding_translation", "0",
PHP_INI_SYSTEM | PHP_INI_PERDIR, OnUpdate_mbstring_encoding_translation,
Index: php4/ext/mssql/php_mssql.c
diff -u php4/ext/mssql/php_mssql.c:1.107 php4/ext/mssql/php_mssql.c:1.108
--- php4/ext/mssql/php_mssql.c:1.107 Mon Feb 10 20:24:07 2003
+++ php4/ext/mssql/php_mssql.c Fri Mar 7 00:15:17 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.107 2003/02/11 01:24:07 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.108 2003/03/07 05:15:17 sniper Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -126,19 +126,19 @@
PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN("mssql.allow_persistent", "1",
PHP_INI_SYSTEM, OnUpdateBool, allow_persistent,
zend_mssql_globals, mssql_globals)
- STD_PHP_INI_ENTRY_EX("mssql.max_persistent", "-1",
PHP_INI_SYSTEM, OnUpdateInt, max_persistent,
zend_mssql_globals, mssql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX("mssql.max_links", "-1",
PHP_INI_SYSTEM, OnUpdateInt, max_links,
zend_mssql_globals, mssql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX("mssql.min_error_severity", "10", PHP_INI_ALL,
OnUpdateInt, cfg_min_error_severity, zend_mssql_globals,
mssql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX("mssql.min_message_severity", "10", PHP_INI_ALL,
OnUpdateInt, cfg_min_message_severity, zend_mssql_globals,
mssql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("mssql.max_persistent", "-1",
PHP_INI_SYSTEM, OnUpdateLong, max_persistent,
zend_mssql_globals, mssql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("mssql.max_links", "-1",
PHP_INI_SYSTEM, OnUpdateLong, max_links,
zend_mssql_globals, mssql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("mssql.min_error_severity", "10", PHP_INI_ALL,
OnUpdateLong, cfg_min_error_severity, zend_mssql_globals,
mssql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("mssql.min_message_severity", "10", PHP_INI_ALL,
OnUpdateLong, cfg_min_message_severity, zend_mssql_globals,
mssql_globals, display_link_numbers)
STD_PHP_INI_BOOLEAN("mssql.compatability_mode", "0", PHP_INI_ALL,
OnUpdateBool, compatability_mode, zend_mssql_globals,
mssql_globals)
- STD_PHP_INI_ENTRY_EX("mssql.connect_timeout", "5", PHP_INI_ALL,
OnUpdateInt, connect_timeout, zend_mssql_globals,
mssql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX("mssql.timeout", "60",
PHP_INI_ALL, OnUpdateInt, timeout,
zend_mssql_globals, mssql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX("mssql.textsize", "-1",
PHP_INI_ALL, OnUpdateInt, textsize,
zend_mssql_globals, mssql_globals, display_text_size)
- STD_PHP_INI_ENTRY_EX("mssql.textlimit", "-1",
PHP_INI_ALL, OnUpdateInt, textlimit,
zend_mssql_globals, mssql_globals, display_text_size)
- STD_PHP_INI_ENTRY_EX("mssql.batchsize", "0",
PHP_INI_ALL, OnUpdateInt, batchsize,
zend_mssql_globals, mssql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("mssql.connect_timeout", "5", PHP_INI_ALL,
OnUpdateLong, connect_timeout, zend_mssql_globals,
mssql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("mssql.timeout", "60",
PHP_INI_ALL, OnUpdateLong, timeout,
zend_mssql_globals, mssql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("mssql.textsize", "-1",
PHP_INI_ALL, OnUpdateLong, textsize,
zend_mssql_globals, mssql_globals, display_text_size)
+ STD_PHP_INI_ENTRY_EX("mssql.textlimit", "-1",
PHP_INI_ALL, OnUpdateLong, textlimit,
zend_mssql_globals, mssql_globals, display_text_size)
+ STD_PHP_INI_ENTRY_EX("mssql.batchsize", "0",
PHP_INI_ALL, OnUpdateLong, batchsize,
zend_mssql_globals, mssql_globals, display_link_numbers)
STD_PHP_INI_BOOLEAN("mssql.datetimeconvert", "1", PHP_INI_ALL,
OnUpdateBool, datetimeconvert, zend_mssql_globals,
mssql_globals)
STD_PHP_INI_BOOLEAN("mssql.secure_connection", "0",
PHP_INI_SYSTEM, OnUpdateBool, secure_connection,
zend_mssql_globals, mssql_globals)
- STD_PHP_INI_ENTRY_EX("mssql.max_procs", "25",
PHP_INI_ALL, OnUpdateInt, max_procs,
zend_mssql_globals, mssql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("mssql.max_procs", "25",
PHP_INI_ALL, OnUpdateLong, max_procs,
zend_mssql_globals, mssql_globals, display_link_numbers)
PHP_INI_END()
/* error handler */
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.185 php4/ext/mysql/php_mysql.c:1.186
--- php4/ext/mysql/php_mysql.c:1.185 Sat Feb 15 22:48:45 2003
+++ php4/ext/mysql/php_mysql.c Fri Mar 7 00:15:18 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.185 2003/02/16 03:48:45 wez Exp $ */
+/* $Id: php_mysql.c,v 1.186 2003/03/07 05:15:18 sniper Exp $ */
/* TODO:
*
@@ -307,16 +307,16 @@
/* {{{ PHP_INI */
PHP_INI_BEGIN()
- STD_PHP_INI_BOOLEAN("mysql.allow_persistent", "1", PHP_INI_SYSTEM,
OnUpdateInt, allow_persistent, zend_mysql_globals,
mysql_globals)
- STD_PHP_INI_ENTRY_EX("mysql.max_persistent", "-1", PHP_INI_SYSTEM,
OnUpdateInt, max_persistent, zend_mysql_globals,
mysql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX("mysql.max_links", "-1",
PHP_INI_SYSTEM, OnUpdateInt, max_links,
zend_mysql_globals, mysql_globals, display_link_numbers)
+ STD_PHP_INI_BOOLEAN("mysql.allow_persistent", "1", PHP_INI_SYSTEM,
OnUpdateLong, allow_persistent, zend_mysql_globals,
mysql_globals)
+ STD_PHP_INI_ENTRY_EX("mysql.max_persistent", "-1", PHP_INI_SYSTEM,
OnUpdateLong, max_persistent, zend_mysql_globals,
mysql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("mysql.max_links", "-1",
PHP_INI_SYSTEM, OnUpdateLong, max_links,
zend_mysql_globals, mysql_globals, display_link_numbers)
STD_PHP_INI_ENTRY("mysql.default_host", NULL, PHP_INI_ALL,
OnUpdateString, default_host, zend_mysql_globals,
mysql_globals)
STD_PHP_INI_ENTRY("mysql.default_user", NULL, PHP_INI_ALL,
OnUpdateString, default_user, zend_mysql_globals,
mysql_globals)
STD_PHP_INI_ENTRY("mysql.default_password", NULL, PHP_INI_ALL,
OnUpdateString, default_password, zend_mysql_globals,
mysql_globals)
PHP_INI_ENTRY("mysql.default_port", NULL,
PHP_INI_ALL, OnMySQLPort)
STD_PHP_INI_ENTRY("mysql.default_socket", NULL, PHP_INI_ALL,
OnUpdateStringUnempty, default_socket, zend_mysql_globals,
mysql_globals)
- STD_PHP_INI_ENTRY("mysql.connect_timeout", "-1",
PHP_INI_SYSTEM, OnUpdateInt, connect_timeout,
zend_mysql_globals, mysql_globals)
- STD_PHP_INI_BOOLEAN("mysql.trace_mode", "0", PHP_INI_ALL,
OnUpdateInt, trace_mode, zend_mysql_globals,
mysql_globals)
+ STD_PHP_INI_ENTRY("mysql.connect_timeout", "-1",
PHP_INI_SYSTEM, OnUpdateLong, connect_timeout,
zend_mysql_globals, mysql_globals)
+ STD_PHP_INI_BOOLEAN("mysql.trace_mode", "0", PHP_INI_ALL,
OnUpdateLong, trace_mode, zend_mysql_globals,
mysql_globals)
PHP_INI_END()
/* }}} */
Index: php4/ext/mysqli/mysqli.c
diff -u php4/ext/mysqli/mysqli.c:1.8 php4/ext/mysqli/mysqli.c:1.9
--- php4/ext/mysqli/mysqli.c:1.8 Mon Mar 3 17:36:47 2003
+++ php4/ext/mysqli/mysqli.c Fri Mar 7 00:15:19 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.8 2003/03/03 22:36:47 georg Exp $
+ $Id: mysqli.c,v 1.9 2003/03/07 05:15:19 sniper Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -155,11 +155,11 @@
/* {{{ PHP_INI_BEGIN
*/
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY_EX("mysqli.max_links", "-1",
PHP_INI_SYSTEM, OnUpdateInt, max_links,
zend_mysqli_globals, mysqli_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("mysqli.max_links", "-1",
PHP_INI_SYSTEM, OnUpdateLong, max_links,
zend_mysqli_globals, mysqli_globals, display_link_numbers)
STD_PHP_INI_ENTRY("mysqli.default_host", NULL,
PHP_INI_ALL, OnUpdateString, default_host,
zend_mysqli_globals, mysqli_globals)
STD_PHP_INI_ENTRY("mysqli.default_user", NULL,
PHP_INI_ALL, OnUpdateString, default_user,
zend_mysqli_globals, mysqli_globals)
STD_PHP_INI_ENTRY("mysqli.default_pw", NULL,
PHP_INI_ALL, OnUpdateString, default_pw,
zend_mysqli_globals, mysqli_globals)
- STD_PHP_INI_ENTRY("mysqli.default_port", "3306",
PHP_INI_ALL, OnUpdateInt, default_port,
zend_mysqli_globals, mysqli_globals)
+ STD_PHP_INI_ENTRY("mysqli.default_port", "3306",
PHP_INI_ALL, OnUpdateLong, default_port,
zend_mysqli_globals, mysqli_globals)
STD_PHP_INI_ENTRY("mysqli.default_socket", NULL,
PHP_INI_ALL, OnUpdateStringUnempty, default_socket, zend_mysqli_globals,
mysqli_globals)
PHP_INI_END()
Index: php4/ext/ncurses/ncurses.c
diff -u php4/ext/ncurses/ncurses.c:1.23 php4/ext/ncurses/ncurses.c:1.24
--- php4/ext/ncurses/ncurses.c:1.23 Tue Dec 31 11:07:04 2002
+++ php4/ext/ncurses/ncurses.c Fri Mar 7 00:15:19 2003
@@ -75,7 +75,7 @@
*/
/* Remove comments and fill if you need to have entries in php.ini
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("ncurses.value", "42", PHP_INI_ALL, OnUpdateInt,
global_value, zend_ncurses_globals, ncurses_globals)
+ STD_PHP_INI_ENTRY("ncurses.value", "42", PHP_INI_ALL, OnUpdateLong,
global_value, zend_ncurses_globals, ncurses_globals)
STD_PHP_INI_ENTRY("ncurses.string", "foobar", PHP_INI_ALL, OnUpdateString,
global_string, zend_ncurses_globals, ncurses_globals)
PHP_INI_END()
*/
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.156 php4/ext/odbc/php_odbc.c:1.157
--- php4/ext/odbc/php_odbc.c:1.156 Tue Mar 4 11:34:52 2003
+++ php4/ext/odbc/php_odbc.c Fri Mar 7 00:15:20 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.156 2003/03/04 16:34:52 iliaa Exp $ */
+/* $Id: php_odbc.c,v 1.157 2003/03/07 05:15:20 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -375,11 +375,11 @@
/* {{{ PHP_INI_BEGIN
*/
PHP_INI_BEGIN()
- STD_PHP_INI_BOOLEAN("odbc.allow_persistent", "1", PHP_INI_SYSTEM, OnUpdateInt,
+ STD_PHP_INI_BOOLEAN("odbc.allow_persistent", "1", PHP_INI_SYSTEM, OnUpdateLong,
allow_persistent, php_odbc_globals, odbc_globals)
- STD_PHP_INI_ENTRY_EX("odbc.max_persistent", "-1", PHP_INI_SYSTEM, OnUpdateInt,
+ STD_PHP_INI_ENTRY_EX("odbc.max_persistent", "-1", PHP_INI_SYSTEM,
OnUpdateLong,
max_persistent, php_odbc_globals, odbc_globals,
display_link_nums)
- STD_PHP_INI_ENTRY_EX("odbc.max_links", "-1", PHP_INI_SYSTEM, OnUpdateInt,
+ STD_PHP_INI_ENTRY_EX("odbc.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong,
max_links, php_odbc_globals, odbc_globals, display_link_nums)
STD_PHP_INI_ENTRY("odbc.default_db", NULL, PHP_INI_ALL, OnUpdateString,
defDB, php_odbc_globals, odbc_globals)
@@ -387,11 +387,11 @@
defUser, php_odbc_globals, odbc_globals)
STD_PHP_INI_ENTRY_EX("odbc.default_pw", NULL, PHP_INI_ALL, OnUpdateString,
defPW, php_odbc_globals, odbc_globals, display_defPW)
- STD_PHP_INI_ENTRY_EX("odbc.defaultlrl", "4096", PHP_INI_ALL, OnUpdateInt,
+ STD_PHP_INI_ENTRY_EX("odbc.defaultlrl", "4096", PHP_INI_ALL, OnUpdateLong,
defaultlrl, php_odbc_globals, odbc_globals, display_lrl)
- STD_PHP_INI_ENTRY_EX("odbc.defaultbinmode", "1", PHP_INI_ALL, OnUpdateInt,
+ STD_PHP_INI_ENTRY_EX("odbc.defaultbinmode", "1", PHP_INI_ALL, OnUpdateLong,
defaultbinmode, php_odbc_globals, odbc_globals,
display_binmode)
- STD_PHP_INI_BOOLEAN("odbc.check_persistent", "1", PHP_INI_SYSTEM, OnUpdateInt,
+ STD_PHP_INI_BOOLEAN("odbc.check_persistent", "1", PHP_INI_SYSTEM, OnUpdateLong,
check_persistent, php_odbc_globals, odbc_globals)
PHP_INI_END()
/* }}} */
Index: php4/ext/pfpro/pfpro.c
diff -u php4/ext/pfpro/pfpro.c:1.27 php4/ext/pfpro/pfpro.c:1.28
--- php4/ext/pfpro/pfpro.c:1.27 Sat Jan 18 19:45:45 2003
+++ php4/ext/pfpro/pfpro.c Fri Mar 7 00:15:20 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pfpro.c,v 1.27 2003/01/19 00:45:45 iliaa Exp $ */
+/* $Id: pfpro.c,v 1.28 2003/03/07 05:15:20 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -74,10 +74,10 @@
/* {{{ initialization defaults */
PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("pfpro.defaulthost", "test-payflow.verisign.com",
PHP_INI_ALL, OnUpdateString, defaulthost, zend_pfpro_globals, pfpro_globals)
- STD_PHP_INI_ENTRY("pfpro.defaultport", "443", PHP_INI_ALL, OnUpdateInt,
defaultport, zend_pfpro_globals, pfpro_globals)
- STD_PHP_INI_ENTRY("pfpro.defaulttimeout", "30", PHP_INI_ALL, OnUpdateInt,
defaulttimeout, zend_pfpro_globals, pfpro_globals)
+ STD_PHP_INI_ENTRY("pfpro.defaultport", "443", PHP_INI_ALL, OnUpdateLong,
defaultport, zend_pfpro_globals, pfpro_globals)
+ STD_PHP_INI_ENTRY("pfpro.defaulttimeout", "30", PHP_INI_ALL, OnUpdateLong,
defaulttimeout, zend_pfpro_globals, pfpro_globals)
STD_PHP_INI_ENTRY("pfpro.proxyaddress", "", PHP_INI_ALL, OnUpdateString,
proxyaddress, zend_pfpro_globals, pfpro_globals)
- STD_PHP_INI_ENTRY("pfpro.proxyport", "", PHP_INI_ALL, OnUpdateInt,
proxyport, zend_pfpro_globals, pfpro_globals)
+ STD_PHP_INI_ENTRY("pfpro.proxyport", "", PHP_INI_ALL, OnUpdateLong,
proxyport, zend_pfpro_globals, pfpro_globals)
STD_PHP_INI_ENTRY("pfpro.proxylogon", "", PHP_INI_ALL, OnUpdateString,
proxylogon, zend_pfpro_globals, pfpro_globals)
STD_PHP_INI_ENTRY("pfpro.proxypassword", "", PHP_INI_ALL, OnUpdateString,
proxypassword, zend_pfpro_globals, pfpro_globals)
PHP_INI_END()
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.264 php4/ext/pgsql/pgsql.c:1.265
--- php4/ext/pgsql/pgsql.c:1.264 Thu Mar 6 18:07:26 2003
+++ php4/ext/pgsql/pgsql.c Fri Mar 7 00:15:20 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.264 2003/03/06 23:07:26 ddhill Exp $ */
+/* $Id: pgsql.c,v 1.265 2003/03/07 05:15:20 sniper Exp $ */
#include <stdlib.h>
@@ -349,8 +349,8 @@
*/
PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN("pgsql.allow_persistent", "1", PHP_INI_SYSTEM,
OnUpdateBool, allow_persistent, php_pgsql_globals,
pgsql_globals)
-STD_PHP_INI_ENTRY_EX("pgsql.max_persistent", "-1", PHP_INI_SYSTEM,
OnUpdateInt, max_persistent, php_pgsql_globals,
pgsql_globals, display_link_numbers)
-STD_PHP_INI_ENTRY_EX("pgsql.max_links", "-1", PHP_INI_SYSTEM,
OnUpdateInt, max_links, php_pgsql_globals,
pgsql_globals, display_link_numbers)
+STD_PHP_INI_ENTRY_EX("pgsql.max_persistent", "-1", PHP_INI_SYSTEM,
OnUpdateLong, max_persistent, php_pgsql_globals,
pgsql_globals, display_link_numbers)
+STD_PHP_INI_ENTRY_EX("pgsql.max_links", "-1", PHP_INI_SYSTEM,
OnUpdateLong, max_links, php_pgsql_globals,
pgsql_globals, display_link_numbers)
STD_PHP_INI_BOOLEAN("pgsql.auto_reset_persistent", "0", PHP_INI_SYSTEM,
OnUpdateBool, auto_reset_persistent, php_pgsql_globals,
pgsql_globals)
STD_PHP_INI_BOOLEAN("pgsql.ignore_notice", "0", PHP_INI_ALL,
OnUpdateBool, ignore_notices, php_pgsql_globals, pgsql_globals)
STD_PHP_INI_BOOLEAN("pgsql.log_notice", "0", PHP_INI_ALL,
OnUpdateBool, log_notices, php_pgsql_globals, pgsql_globals)
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.356 php4/ext/session/session.c:1.357
--- php4/ext/session/session.c:1.356 Sun Mar 2 05:19:13 2003
+++ php4/ext/session/session.c Fri Mar 7 00:15:22 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.356 2003/03/02 10:19:13 zeev Exp $ */
+/* $Id: session.c,v 1.357 2003/03/07 05:15:22 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -137,11 +137,11 @@
STD_PHP_INI_ENTRY("session.name", "PHPSESSID", PHP_INI_ALL,
OnUpdateString, session_name, php_ps_globals, ps_globals)
PHP_INI_ENTRY("session.save_handler", "files", PHP_INI_ALL,
OnUpdateSaveHandler)
STD_PHP_INI_BOOLEAN("session.auto_start", "0", PHP_INI_ALL,
OnUpdateBool, auto_start, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.gc_probability", "1", PHP_INI_ALL,
OnUpdateInt, gc_probability, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.gc_dividend", "100", PHP_INI_ALL,
OnUpdateInt, gc_dividend, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.gc_maxlifetime", "1440", PHP_INI_ALL,
OnUpdateInt, gc_maxlifetime, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.gc_probability", "1", PHP_INI_ALL,
OnUpdateLong, gc_probability, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.gc_dividend", "100", PHP_INI_ALL,
OnUpdateLong, gc_dividend, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.gc_maxlifetime", "1440", PHP_INI_ALL,
OnUpdateLong, gc_maxlifetime, php_ps_globals, ps_globals)
PHP_INI_ENTRY("session.serialize_handler", "php", PHP_INI_ALL,
OnUpdateSerializer)
- STD_PHP_INI_ENTRY("session.cookie_lifetime", "0", PHP_INI_ALL,
OnUpdateInt, cookie_lifetime, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.cookie_lifetime", "0", PHP_INI_ALL,
OnUpdateLong, cookie_lifetime, php_ps_globals, ps_globals)
STD_PHP_INI_ENTRY("session.cookie_path", "/", PHP_INI_ALL,
OnUpdateString, cookie_path, php_ps_globals, ps_globals)
STD_PHP_INI_ENTRY("session.cookie_domain", "", PHP_INI_ALL,
OnUpdateString, cookie_domain, php_ps_globals, ps_globals)
STD_PHP_INI_BOOLEAN("session.cookie_secure", "", PHP_INI_ALL,
OnUpdateBool, cookie_secure, php_ps_globals, ps_globals)
@@ -149,12 +149,12 @@
STD_PHP_INI_BOOLEAN("session.use_only_cookies", "0", PHP_INI_ALL,
OnUpdateBool, use_only_cookies, php_ps_globals, ps_globals)
STD_PHP_INI_ENTRY("session.referer_check", "", PHP_INI_ALL,
OnUpdateString, extern_referer_chk, php_ps_globals, ps_globals)
STD_PHP_INI_ENTRY("session.entropy_file", "", PHP_INI_ALL,
OnUpdateString, entropy_file, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.entropy_length", "0", PHP_INI_ALL,
OnUpdateInt, entropy_length, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.entropy_length", "0", PHP_INI_ALL,
OnUpdateLong, entropy_length, php_ps_globals, ps_globals)
STD_PHP_INI_ENTRY("session.cache_limiter", "nocache", PHP_INI_ALL,
OnUpdateString, cache_limiter, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.cache_expire", "180", PHP_INI_ALL,
OnUpdateInt, cache_expire, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.cache_expire", "180", PHP_INI_ALL,
OnUpdateLong, cache_expire, php_ps_globals, ps_globals)
STD_PHP_INI_BOOLEAN("session.use_trans_sid", "0",
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, use_trans_sid, php_ps_globals,
ps_globals)
- STD_PHP_INI_ENTRY("session.hash_function", "0", PHP_INI_ALL,
OnUpdateInt, hash_func, php_ps_globals, ps_globals)
- STD_PHP_INI_ENTRY("session.hash_bits_per_character", "4",
PHP_INI_ALL, OnUpdateInt, hash_bits_per_character, php_ps_globals,
ps_globals)
+ STD_PHP_INI_ENTRY("session.hash_function", "0", PHP_INI_ALL,
OnUpdateLong, hash_func, php_ps_globals, ps_globals)
+ STD_PHP_INI_ENTRY("session.hash_bits_per_character", "4",
PHP_INI_ALL, OnUpdateLong, hash_bits_per_character, php_ps_globals,
ps_globals)
/* Commented out until future discussion */
/* PHP_INI_ENTRY("session.encode_sources", "globals,track", PHP_INI_ALL, NULL)
*/
Index: php4/ext/skeleton/skeleton.c
diff -u php4/ext/skeleton/skeleton.c:1.32 php4/ext/skeleton/skeleton.c:1.33
--- php4/ext/skeleton/skeleton.c:1.32 Sat Dec 1 19:59:44 2001
+++ php4/ext/skeleton/skeleton.c Fri Mar 7 00:15:23 2003
@@ -55,7 +55,7 @@
*/
/* Remove comments and fill if you need to have entries in php.ini
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("extname.global_value", "42", PHP_INI_ALL, OnUpdateInt,
global_value, zend_extname_globals, extname_globals)
+ STD_PHP_INI_ENTRY("extname.global_value", "42", PHP_INI_ALL, OnUpdateLong,
global_value, zend_extname_globals, extname_globals)
STD_PHP_INI_ENTRY("extname.global_string", "foobar", PHP_INI_ALL, OnUpdateString,
global_string, zend_extname_globals, extname_globals)
PHP_INI_END()
*/
Index: php4/ext/standard/assert.c
diff -u php4/ext/standard/assert.c:1.52 php4/ext/standard/assert.c:1.53
--- php4/ext/standard/assert.c:1.52 Fri Jan 24 11:29:40 2003
+++ php4/ext/standard/assert.c Fri Mar 7 00:15:23 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: assert.c,v 1.52 2003/01/24 16:29:40 iliaa Exp $ */
+/* $Id: assert.c,v 1.53 2003/03/07 05:15:23 sniper Exp $ */
/* {{{ includes/startup/misc */
@@ -68,11 +68,11 @@
}
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("assert.active", "1", PHP_INI_ALL,
OnUpdateInt, active, php_assert_globals,
assert_globals)
- STD_PHP_INI_ENTRY("assert.bail", "0", PHP_INI_ALL,
OnUpdateInt, bail, php_assert_globals,
assert_globals)
- STD_PHP_INI_ENTRY("assert.warning", "1", PHP_INI_ALL, OnUpdateInt,
warning, php_assert_globals,
assert_globals)
+ STD_PHP_INI_ENTRY("assert.active", "1", PHP_INI_ALL,
OnUpdateLong, active, php_assert_globals,
assert_globals)
+ STD_PHP_INI_ENTRY("assert.bail", "0", PHP_INI_ALL,
OnUpdateLong, bail, php_assert_globals,
assert_globals)
+ STD_PHP_INI_ENTRY("assert.warning", "1", PHP_INI_ALL, OnUpdateLong,
warning, php_assert_globals,
assert_globals)
PHP_INI_ENTRY ("assert.callback", NULL, PHP_INI_ALL,
OnChangeCallback)
- STD_PHP_INI_ENTRY("assert.quiet_eval", "0", PHP_INI_ALL, OnUpdateInt,
quiet_eval, php_assert_globals,
assert_globals)
+ STD_PHP_INI_ENTRY("assert.quiet_eval", "0", PHP_INI_ALL, OnUpdateLong,
quiet_eval, php_assert_globals,
assert_globals)
PHP_INI_END()
static void php_assert_init_globals(php_assert_globals *assert_globals_p TSRMLS_DC)
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.323 php4/ext/standard/file.c:1.324
--- php4/ext/standard/file.c:1.323 Thu Mar 6 15:31:17 2003
+++ php4/ext/standard/file.c Fri Mar 7 00:15:23 2003
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.323 2003/03/06 20:31:17 sesser Exp $ */
+/* $Id: file.c,v 1.324 2003/03/07 05:15:23 sniper Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -146,8 +146,8 @@
PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("user_agent", NULL, PHP_INI_ALL, OnUpdateString, user_agent,
php_file_globals, file_globals)
- STD_PHP_INI_ENTRY("default_socket_timeout", "60", PHP_INI_ALL, OnUpdateInt,
default_socket_timeout, php_file_globals, file_globals)
- STD_PHP_INI_ENTRY("auto_detect_line_endings", "0", PHP_INI_ALL, OnUpdateInt,
auto_detect_line_endings, php_file_globals, file_globals)
+ STD_PHP_INI_ENTRY("default_socket_timeout", "60", PHP_INI_ALL, OnUpdateLong,
default_socket_timeout, php_file_globals, file_globals)
+ STD_PHP_INI_ENTRY("auto_detect_line_endings", "0", PHP_INI_ALL, OnUpdateLong,
auto_detect_line_endings, php_file_globals, file_globals)
PHP_INI_END()
PHP_MINIT_FUNCTION(file)
Index: php4/ext/sybase_ct/php_sybase_ct.c
diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.81 php4/ext/sybase_ct/php_sybase_ct.c:1.82
--- php4/ext/sybase_ct/php_sybase_ct.c:1.81 Wed Jan 29 21:33:13 2003
+++ php4/ext/sybase_ct/php_sybase_ct.c Fri Mar 7 00:15:24 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_ct.c,v 1.81 2003/01/30 02:33:13 iliaa Exp $ */
+/* $Id: php_sybase_ct.c,v 1.82 2003/03/07 05:15:24 sniper Exp $ */
#ifdef HAVE_CONFIG_H
@@ -294,13 +294,13 @@
PHP_INI_BEGIN()
- STD_PHP_INI_BOOLEAN("sybct.allow_persistent", "1", PHP_INI_SYSTEM,
OnUpdateInt, allow_persistent, zend_sybase_globals,
sybase_globals)
- STD_PHP_INI_ENTRY_EX("sybct.max_persistent", "-1", PHP_INI_SYSTEM,
OnUpdateInt, max_persistent, zend_sybase_globals,
sybase_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX("sybct.max_links", "-1", PHP_INI_SYSTEM,
OnUpdateInt, max_links, zend_sybase_globals,
sybase_globals, display_link_numbers)
- STD_PHP_INI_ENTRY("sybct.min_server_severity", "10", PHP_INI_ALL,
OnUpdateInt, min_server_severity, zend_sybase_globals,
sybase_globals)
- STD_PHP_INI_ENTRY("sybct.min_client_severity", "10", PHP_INI_ALL,
OnUpdateInt, min_client_severity, zend_sybase_globals,
sybase_globals)
+ STD_PHP_INI_BOOLEAN("sybct.allow_persistent", "1", PHP_INI_SYSTEM,
OnUpdateLong, allow_persistent, zend_sybase_globals,
sybase_globals)
+ STD_PHP_INI_ENTRY_EX("sybct.max_persistent", "-1", PHP_INI_SYSTEM,
OnUpdateLong, max_persistent, zend_sybase_globals,
sybase_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("sybct.max_links", "-1", PHP_INI_SYSTEM,
OnUpdateLong, max_links, zend_sybase_globals,
sybase_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY("sybct.min_server_severity", "10", PHP_INI_ALL,
OnUpdateLong, min_server_severity, zend_sybase_globals,
sybase_globals)
+ STD_PHP_INI_ENTRY("sybct.min_client_severity", "10", PHP_INI_ALL,
OnUpdateLong, min_client_severity, zend_sybase_globals,
sybase_globals)
STD_PHP_INI_ENTRY("sybct.hostname", NULL, PHP_INI_ALL,
OnUpdateString, hostname, zend_sybase_globals,
sybase_globals)
- STD_PHP_INI_ENTRY_EX("sybct.deadlock_retry_count", "-1", PHP_INI_ALL,
OnUpdateInt, deadlock_retry_count, zend_sybase_globals,
sybase_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX("sybct.deadlock_retry_count", "-1", PHP_INI_ALL,
OnUpdateLong, deadlock_retry_count, zend_sybase_globals,
sybase_globals, display_link_numbers)
PHP_INI_END()
Index: php4/ext/sysvmsg/sysvmsg.c
diff -u php4/ext/sysvmsg/sysvmsg.c:1.9 php4/ext/sysvmsg/sysvmsg.c:1.10
--- php4/ext/sysvmsg/sysvmsg.c:1.9 Thu Mar 6 20:03:04 2003
+++ php4/ext/sysvmsg/sysvmsg.c Fri Mar 7 00:15:25 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sysvmsg.c,v 1.9 2003/03/07 01:03:04 sniper Exp $ */
+/* $Id: sysvmsg.c,v 1.10 2003/03/07 05:15:25 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -82,7 +82,7 @@
*/
/* Remove comments and fill if you need to have entries in php.ini
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("sysvmsg.value", "42", PHP_INI_ALL, OnUpdateInt,
global_value, zend_sysvmsg_globals, sysvmsg_globals)
+ STD_PHP_INI_ENTRY("sysvmsg.value", "42", PHP_INI_ALL, OnUpdateLong,
global_value, zend_sysvmsg_globals, sysvmsg_globals)
STD_PHP_INI_ENTRY("sysvmsg.string", "foobar", PHP_INI_ALL, OnUpdateString,
global_string, zend_sysvmsg_globals, sysvmsg_globals)
PHP_INI_END()
*/
@@ -120,7 +120,7 @@
{
php_info_print_table_start();
php_info_print_table_row(2, "sysvmsg support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.9 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.10 $");
php_info_print_table_end();
}
/* }}} */
Index: php4/ext/tokenizer/tokenizer.c
diff -u php4/ext/tokenizer/tokenizer.c:1.14 php4/ext/tokenizer/tokenizer.c:1.15
--- php4/ext/tokenizer/tokenizer.c:1.14 Mon Feb 24 21:08:49 2003
+++ php4/ext/tokenizer/tokenizer.c Fri Mar 7 00:15:25 2003
@@ -136,7 +136,7 @@
*/
/* Remove comments and fill if you need to have entries in php.ini
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("tokenizer.global_value", "42", PHP_INI_ALL,
OnUpdateInt, global_value, zend_tokenizer_globals, tokenizer_globals)
+ STD_PHP_INI_ENTRY("tokenizer.global_value", "42", PHP_INI_ALL,
OnUpdateLong, global_value, zend_tokenizer_globals, tokenizer_globals)
STD_PHP_INI_ENTRY("tokenizer.global_string", "foobar", PHP_INI_ALL,
OnUpdateString, global_string, zend_tokenizer_globals, tokenizer_globals)
PHP_INI_END()
*/
Index: php4/ext/yaz/php_yaz.c
diff -u php4/ext/yaz/php_yaz.c:1.66 php4/ext/yaz/php_yaz.c:1.67
--- php4/ext/yaz/php_yaz.c:1.66 Fri Feb 28 02:17:46 2003
+++ php4/ext/yaz/php_yaz.c Fri Mar 7 00:15:25 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_yaz.c,v 1.66 2003/02/28 07:17:46 sniper Exp $ */
+/* $Id: php_yaz.c,v 1.67 2003/03/07 05:15:25 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1455,7 +1455,7 @@
/* {{{ PHP_INI_BEGIN
*/
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("yaz.max_links", "100", PHP_INI_ALL, OnUpdateInt, max_links,
zend_yaz_globals, yaz_globals)
+ STD_PHP_INI_ENTRY("yaz.max_links", "100", PHP_INI_ALL, OnUpdateLong,
max_links, zend_yaz_globals, yaz_globals)
STD_PHP_INI_ENTRY("yaz.log_file", NULL, PHP_INI_ALL, OnUpdateString, log_file,
zend_yaz_globals, yaz_globals)
PHP_INI_END()
/* }}} */
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.165 php4/ext/zlib/zlib.c:1.166
--- php4/ext/zlib/zlib.c:1.165 Thu Mar 6 18:07:28 2003
+++ php4/ext/zlib/zlib.c Fri Mar 7 00:15:26 2003
@@ -18,7 +18,7 @@
| Jade Nicoletti <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.165 2003/03/06 23:07:28 ddhill Exp $ */
+/* $Id: zlib.c,v 1.166 2003/03/07 05:15:26 sniper Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -157,7 +157,7 @@
return FAILURE;
}
- OnUpdateInt(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3,
stage TSRMLS_CC);
+ OnUpdateLong(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3,
stage TSRMLS_CC);
return SUCCESS;
}
@@ -166,7 +166,7 @@
/* {{{ OnUpdate_zlib_output_compression_level */
static PHP_INI_MH(OnUpdate_zlib_output_compression_level)
{
- OnUpdateInt(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3,
stage TSRMLS_CC);
+ OnUpdateLong(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3,
stage TSRMLS_CC);
return SUCCESS;
}
Index: php4/main/main.c
diff -u php4/main/main.c:1.535 php4/main/main.c:1.536
--- php4/main/main.c:1.535 Thu Mar 6 15:31:19 2003
+++ php4/main/main.c Fri Mar 7 00:15:26 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.535 2003/03/06 20:31:19 sesser Exp $ */
+/* $Id: main.c,v 1.536 2003/03/07 05:15:26 sniper Exp $ */
/* {{{ includes
*/
@@ -274,12 +274,12 @@
STD_PHP_INI_ENTRY("docref_ext", "",
PHP_INI_ALL, OnUpdateString, docref_ext,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("html_errors", "1",
PHP_INI_ALL, OnUpdateBool, html_errors,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("xmlrpc_errors", "0",
PHP_INI_SYSTEM, OnUpdateBool, xmlrpc_errors,
php_core_globals, core_globals)
- STD_PHP_INI_ENTRY("xmlrpc_error_number", "0", PHP_INI_ALL,
OnUpdateInt, xmlrpc_error_number, php_core_globals,
core_globals)
- STD_PHP_INI_ENTRY("max_input_time", "-1",
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateInt,
max_input_time, php_core_globals, core_globals)
+ STD_PHP_INI_ENTRY("xmlrpc_error_number", "0", PHP_INI_ALL,
OnUpdateLong, xmlrpc_error_number, php_core_globals,
core_globals)
+ STD_PHP_INI_ENTRY("max_input_time", "-1",
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateLong,
max_input_time, php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("ignore_user_abort", "0", PHP_INI_ALL,
OnUpdateBool, ignore_user_abort,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("implicit_flush", "0", PHP_INI_ALL,
OnUpdateBool, implicit_flush,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("log_errors", "0",
PHP_INI_ALL, OnUpdateBool, log_errors,
php_core_globals, core_globals)
- STD_PHP_INI_ENTRY("log_errors_max_len", "1024", PHP_INI_ALL,
OnUpdateInt, log_errors_max_len,
php_core_globals, core_globals)
+ STD_PHP_INI_ENTRY("log_errors_max_len", "1024", PHP_INI_ALL,
OnUpdateLong, log_errors_max_len,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("ignore_repeated_errors", "0", PHP_INI_ALL,
OnUpdateBool, ignore_repeated_errors, php_core_globals,
core_globals)
STD_PHP_INI_BOOLEAN("ignore_repeated_source", "0", PHP_INI_ALL,
OnUpdateBool, ignore_repeated_source, php_core_globals,
core_globals)
STD_PHP_INI_BOOLEAN("report_memleaks", "1", PHP_INI_ALL,
OnUpdateBool, report_memleaks,
php_core_globals, core_globals)
@@ -287,7 +287,7 @@
STD_PHP_INI_BOOLEAN("magic_quotes_gpc", "1",
PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, magic_quotes_gpc,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("magic_quotes_runtime", "0", PHP_INI_ALL,
OnUpdateBool, magic_quotes_runtime, php_core_globals,
core_globals)
STD_PHP_INI_BOOLEAN("magic_quotes_sybase", "0", PHP_INI_ALL,
OnUpdateBool, magic_quotes_sybase, php_core_globals,
core_globals)
- STD_PHP_INI_ENTRY("output_buffering", "0",
PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateInt, output_buffering,
php_core_globals, core_globals)
+ STD_PHP_INI_ENTRY("output_buffering", "0",
PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateLong, output_buffering,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY("output_handler", NULL,
PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateString, output_handler,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("register_argc_argv", "1",
PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, register_argc_argv,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("register_globals", "0",
PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, register_globals,
php_core_globals, core_globals)
@@ -322,8 +322,8 @@
STD_PHP_INI_ENTRY("safe_mode_exec_dir", "",
PHP_INI_SYSTEM, OnUpdateString, safe_mode_exec_dir,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("file_uploads", "1",
PHP_INI_SYSTEM, OnUpdateBool, file_uploads,
php_core_globals, core_globals)
- STD_PHP_INI_ENTRY("upload_max_filesize", "2M",
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateInt,
upload_max_filesize, php_core_globals, core_globals)
- STD_PHP_INI_ENTRY("post_max_size", "8M",
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateInt, post_max_size,
sapi_globals_struct,sapi_globals)
+ STD_PHP_INI_ENTRY("upload_max_filesize", "2M",
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateLong,
upload_max_filesize, php_core_globals, core_globals)
+ STD_PHP_INI_ENTRY("post_max_size", "8M",
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateLong, post_max_size,
sapi_globals_struct,sapi_globals)
STD_PHP_INI_ENTRY("upload_tmp_dir", NULL,
PHP_INI_SYSTEM, OnUpdateStringUnempty, upload_tmp_dir,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY("user_dir", NULL,
PHP_INI_SYSTEM, OnUpdateString, user_dir,
php_core_globals, core_globals)
Index: php4/netware/phplib.imp
diff -u php4/netware/phplib.imp:1.5 php4/netware/phplib.imp:1.6
--- php4/netware/phplib.imp:1.5 Mon Jan 6 04:08:55 2003
+++ php4/netware/phplib.imp Fri Mar 7 00:15:27 2003
@@ -172,6 +172,6 @@
zend_wrong_param_count,
zval_add_ref,
OnUpdateBool,
-OnUpdateInt,
+OnUpdateLong,
OnUpdateString,
OnUpdateStringUnempty
Index: php4/sapi/apache/php_apache.c
diff -u php4/sapi/apache/php_apache.c:1.77 php4/sapi/apache/php_apache.c:1.78
--- php4/sapi/apache/php_apache.c:1.77 Tue Jan 21 09:56:36 2003
+++ php4/sapi/apache/php_apache.c Fri Mar 7 00:15:27 2003
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.77 2003/01/21 14:56:36 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.78 2003/03/07 05:15:27 sniper Exp $ */
#include "php_apache_http.h"
@@ -66,10 +66,10 @@
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("xbithack", "0",
PHP_INI_ALL, OnUpdateInt, xbithack, php_apache_info_struct,
php_apache_info)
- STD_PHP_INI_ENTRY("engine", "1",
PHP_INI_ALL, OnUpdateInt, engine,
php_apache_info_struct, php_apache_info)
- STD_PHP_INI_ENTRY("last_modified", "0",
PHP_INI_ALL, OnUpdateInt, last_modified,
php_apache_info_struct, php_apache_info)
- STD_PHP_INI_ENTRY("child_terminate", "0",
PHP_INI_ALL, OnUpdateInt, terminate_child,
php_apache_info_struct, php_apache_info)
+ STD_PHP_INI_ENTRY("xbithack", "0",
PHP_INI_ALL, OnUpdateLong, xbithack, php_apache_info_struct,
php_apache_info)
+ STD_PHP_INI_ENTRY("engine", "1",
PHP_INI_ALL, OnUpdateLong, engine,
php_apache_info_struct, php_apache_info)
+ STD_PHP_INI_ENTRY("last_modified", "0",
PHP_INI_ALL, OnUpdateLong, last_modified,
php_apache_info_struct, php_apache_info)
+ STD_PHP_INI_ENTRY("child_terminate", "0",
PHP_INI_ALL, OnUpdateLong, terminate_child,
php_apache_info_struct, php_apache_info)
PHP_INI_END()
Index: php4/sapi/apache_hooks/php_apache.c
diff -u php4/sapi/apache_hooks/php_apache.c:1.10
php4/sapi/apache_hooks/php_apache.c:1.11
--- php4/sapi/apache_hooks/php_apache.c:1.10 Tue Jan 21 09:56:40 2003
+++ php4/sapi/apache_hooks/php_apache.c Fri Mar 7 00:15:28 2003
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.10 2003/01/21 14:56:40 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.11 2003/03/07 05:15:28 sniper Exp $ */
#include "php_apache_http.h"
@@ -77,10 +77,10 @@
/* {{{ php_apache ini entries
*/
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("xbithack", "0",
PHP_INI_ALL, OnUpdateInt, xbithack, php_apache_info_struct,
php_apache_info)
- STD_PHP_INI_ENTRY("engine", "1",
PHP_INI_ALL, OnUpdateInt, engine,
php_apache_info_struct, php_apache_info)
- STD_PHP_INI_ENTRY("last_modified", "0",
PHP_INI_ALL, OnUpdateInt, last_modified,
php_apache_info_struct, php_apache_info)
- STD_PHP_INI_ENTRY("child_terminate", "0",
PHP_INI_ALL, OnUpdateInt, terminate_child,
php_apache_info_struct, php_apache_info)
+ STD_PHP_INI_ENTRY("xbithack", "0",
PHP_INI_ALL, OnUpdateLong, xbithack, php_apache_info_struct,
php_apache_info)
+ STD_PHP_INI_ENTRY("engine", "1",
PHP_INI_ALL, OnUpdateLong, engine,
php_apache_info_struct, php_apache_info)
+ STD_PHP_INI_ENTRY("last_modified", "0",
PHP_INI_ALL, OnUpdateLong, last_modified,
php_apache_info_struct, php_apache_info)
+ STD_PHP_INI_ENTRY("child_terminate", "0",
PHP_INI_ALL, OnUpdateLong, terminate_child,
php_apache_info_struct, php_apache_info)
PHP_INI_END()
/* }}} */
Index: php4/scripts/ext_skel_ng/extension_parser.php
diff -u php4/scripts/ext_skel_ng/extension_parser.php:1.6
php4/scripts/ext_skel_ng/extension_parser.php:1.7
--- php4/scripts/ext_skel_ng/extension_parser.php:1.6 Fri Feb 28 01:37:04 2003
+++ php4/scripts/ext_skel_ng/extension_parser.php Fri Mar 7 00:15:28 2003
@@ -247,7 +247,7 @@
switch($attr["type"]) {
case "int":
case "long":
- $ini["onupdate"] = "OnUpdateInt";
+ $ini["onupdate"] = "OnUpdateLong";
break;
case "float":
case "double":
@@ -283,7 +283,7 @@
$fp = fopen("$docdir/reference.xml", "w");
fputs($fp,
"<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- \$Revision: 1.6 $ -->
+<!-- \$Revision: 1.7 $ -->
<reference id='ref.{$this->name}'>
<title>{$this->summary}</title>
<titleabbrev>{$this->name}</titleabbrev>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
