Diff -u against php4-STABLE-200302241430 Also needed in 4.5.x and 5.x
Addresses bugs 20994, 21002, 21822, 20268 Platforms affected, Tru64, Solaris 9, HP-UX, NetBSD/Alpha and any other 64 bit platform I forgot to mention....
A little education first....
on some platforms, sizeof(int) != sizeof(long) This is particularly true on 64 bit platforms.
Mixed int* and long* in these cases can be deadly, and can cause hard to find problems. This is because if the machine writes to a long* that is really pointing at an int, then "extra" data gets written past the end of the int corrupting whatever is after that int.
Also on 64 bit platforms, only a long is going to be big enough to hold a pointer, so assigning a pointer value to an int, and then assigning it back will result in truncation of data.
Lastly, sizeof(size_t) == sizeof(long) which means if you plan to mix things, don't mix size_t and int.
The particular problem that sparked this patch is a particular problem
with OnUpdateInt called from zlib, as this function assumes a &long is passed in,
despite the name. In the source code - this function was passed a long
in about 70% of the cases, an int in rest. What was passed was not
always consitant in a particular source module.
I chose to address this problem by creating OnUpdateLong (in addition to to existing OnUpdateInt) and sweep though the code changing the call where needed to match the stucture item. An equally valid fix would be to change all of those longs to ints.
After performing that sweep, I found there was a small number of other errors of the int/long type that my compiler found that I corrected and are included here. There might be more mix and match problems, I only addressed the ones in the modules I have enabled.
Files affected: Zend/zend_ini.c Zend/zend_ini.h ext/fbsql/php_fbsql.c ext/hyperwave/hw.c ext/ingres_ii/ii.c ext/interbase/interbase.c ext/ldap/ldap.c ext/mbstring/mbstring.c ext/mssql/php_mssql.c ext/mysql/php_mysql.c ext/odbc/php_odbc.c ext/pgsql/pgsql.c ext/session/session.c ext/standard/assert.c ext/standard/file.c ext/standard/info.c ext/standard/url_scanner_ex.c ext/sybase_ct/php_sybase_ct.c main/main.c sapi/apache/php_apache.c
--- php4-STABLE-200302241430/Zend/zend_ini.c 2002-12-31 12:15:18.000000000 -0500
+++ php4-STABLE-200302241430.mod/Zend/zend_ini.c 2003-02-27 14:25:11.000000000
-0500
@@ -427,9 +427,35 @@
return SUCCESS;
}
-
+/*
+ * Note: on 64 bit platforms, sizeof(long) != sizeof(int) and
+ * long* and int* cannot be used interchangably without disaster !
+ * OnUpdateInt or OnUpdateLong must match the resource type !
+ */
ZEND_API ZEND_INI_MH(OnUpdateInt)
{
+ int *p;
+#ifndef ZTS
+ char *base = (char *) mh_arg2;
+#else
+ char *base;
+
+ base = (char *) ts_resource(*((int *) mh_arg2));
+#endif
+
+ p = (int *) (base+(size_t) mh_arg1);
+
+ *p = zend_atoi(new_value, new_value_length);
+ return SUCCESS;
+}
+
+/*
+ * Note: on 64 bit platforms, sizeof(long) != sizeof(int) and
+ * long* and int* cannot be used interchangably without disaster !
+ * OnUpdateInt or OnUpdateLong must match the resource type !
+ */
+ZEND_API ZEND_INI_MH(OnUpdateLong)
+{
long *p;
#ifndef ZTS
char *base = (char *) mh_arg2;
@@ -445,7 +471,6 @@
return SUCCESS;
}
-
ZEND_API ZEND_INI_MH(OnUpdateReal)
{
double *p;
--- php4-STABLE-200302241430/Zend/zend_ini.h 2002-12-31 12:15:18.000000000 -0500
+++ php4-STABLE-200302241430.mod/Zend/zend_ini.h 2003-02-27 14:25:11.000000000
-0500
@@ -171,6 +171,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);
--- php4-STABLE-200302241430/ext/fbsql/php_fbsql.c 2003-02-12 16:13:08.000000000
-0500
+++ php4-STABLE-200302241430.mod/ext/fbsql/php_fbsql.c 2003-02-27 14:25:11.000000000
-0500
@@ -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)
--- php4-STABLE-200302241430/ext/hyperwave/hw.c 2003-01-28 13:10:29.000000000 -0500
+++ php4-STABLE-200302241430.mod/ext/hyperwave/hw.c 2003-02-27 14:25:11.000000000
-0500
@@ -199,7 +199,7 @@
}
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("hyerwave.allow_persistent", "0", PHP_INI_SYSTEM,
OnUpdateInt, allow_persistent, zend_hw_globals, hw_globals)
+ STD_PHP_INI_ENTRY("hyerwave.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()
--- php4-STABLE-200302241430/ext/ingres_ii/ii.c 2003-02-21 02:10:49.000000000 -0500
+++ php4-STABLE-200302241430.mod/ext/ingres_ii/ii.c 2003-02-27 14:25:12.000000000
-0500
@@ -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)
--- php4-STABLE-200302241430/ext/interbase/interbase.c 2002-12-31 12:15:19.000000000
-0500
+++ php4-STABLE-200302241430.mod/ext/interbase/interbase.c 2003-02-27
14:25:12.000000000 -0500
@@ -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)
--- php4-STABLE-200302241430/ext/ldap/ldap.c 2002-12-31 12:15:19.000000000 -0500
+++ php4-STABLE-200302241430.mod/ext/ldap/ldap.c 2003-02-27 14:25:12.000000000
-0500
@@ -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()
/* }}} */
--- php4-STABLE-200302241430/ext/mbstring/mbstring.c 2003-02-20 13:13:34.000000000
-0500
+++ php4-STABLE-200302241430.mod/ext/mbstring/mbstring.c 2003-02-27
14:25:12.000000000 -0500
@@ -703,7 +703,7 @@
new_value_length = sizeof("1");
}
- OnUpdateInt(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3,
stage TSRMLS_CC);
+ OnUpdateBool(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3,
stage TSRMLS_CC);
if (MBSTRG(encoding_translation)){
sapi_unregister_post_entry(php_post_entries);
@@ -731,7 +731,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,
--- php4-STABLE-200302241430/ext/mssql/php_mssql.c 2003-02-10 21:09:53.000000000
-0500
+++ php4-STABLE-200302241430.mod/ext/mssql/php_mssql.c 2003-02-27 14:25:12.000000000
-0500
@@ -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 */
--- php4-STABLE-200302241430/ext/mysql/php_mysql.c 2003-01-08 07:25:53.000000000
-0500
+++ php4-STABLE-200302241430.mod/ext/mysql/php_mysql.c 2003-02-27 14:25:12.000000000
-0500
@@ -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()
/* }}} */
--- php4-STABLE-200302241430/ext/odbc/php_odbc.c 2003-02-06 22:12:33.000000000
-0500
+++ php4-STABLE-200302241430.mod/ext/odbc/php_odbc.c 2003-02-27 14:25:12.000000000
-0500
@@ -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()
/* }}} */
--- php4-STABLE-200302241430/ext/pgsql/pgsql.c 2003-02-20 03:12:02.000000000 -0500
+++ php4-STABLE-200302241430.mod/ext/pgsql/pgsql.c 2003-02-27 14:25:12.000000000
-0500
@@ -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)
@@ -606,7 +606,7 @@
pgsql = (PGconn *) le->ptr;
}
ZEND_REGISTER_RESOURCE(return_value, pgsql, le_plink);
- } else { // Non persistent connection
+ } else { /* Non persistent connection */
list_entry *index_ptr,new_index_ptr;
/* first we check the hash for the hashed_details key. if it exists,
@@ -3078,7 +3078,7 @@
PGresult *pg_result;
char *tmp_name;
smart_str querystr = {0};
- size_t new_len;
+ int new_len;
int i, num_rows;
zval *elem;
@@ -3978,7 +3978,8 @@
char buf[256];
char *fld;
smart_str querystr = {0};
- int key_type, fld_len, ret = FAILURE;
+ int key_type, ret = FAILURE;
+ uint fld_len;
ulong num_idx;
HashPosition pos;
@@ -4108,7 +4109,7 @@
static inline int build_assignment_string(smart_str *querystr, HashTable *ht, const
char *pad, int pad_len TSRMLS_DC)
{
HashPosition pos;
- size_t fld_len;
+ uint fld_len;
int key_type;
ulong num_idx;
char *fld;
@@ -4348,7 +4349,8 @@
{
zval *row;
char *field_name, *element, *data;
- size_t num_fields, element_len, data_len;
+ size_t num_fields, element_len;
+ uint data_len;
int pg_numrows, pg_row;
uint i;
assert(Z_TYPE_P(ret_array) == IS_ARRAY);
--- php4-STABLE-200302241430/ext/session/session.c 2003-02-20 04:16:11.000000000
-0500
+++ php4-STABLE-200302241430.mod/ext/session/session.c 2003-02-27 14:25:12.000000000
-0500
@@ -136,11 +136,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)
@@ -148,9 +148,9 @@
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)
/* Commented out until future discussion */
--- php4-STABLE-200302241430/ext/standard/assert.c 2002-12-31 12:15:21.000000000
-0500
+++ php4-STABLE-200302241430.mod/ext/standard/assert.c 2003-02-27 14:25:12.000000000
-0500
@@ -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)
--- php4-STABLE-200302241430/ext/standard/file.c 2003-02-23 23:13:07.000000000
-0500
+++ php4-STABLE-200302241430.mod/ext/standard/file.c 2003-02-27 14:25:13.000000000
-0500
@@ -143,8 +143,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)
--- php4-STABLE-200302241430/ext/standard/info.c 2003-02-13 12:12:22.000000000
-0500
+++ php4-STABLE-200302241430.mod/ext/standard/info.c 2003-02-27 14:25:13.000000000
-0500
@@ -472,7 +472,8 @@
{
HashTable *url_stream_wrappers_hash;
char *stream_protocol, *stream_protocols_buf = NULL;
- int stream_protocol_len, stream_protocols_buf_len = 0;
+ uint stream_protocol_len;
+ int stream_protocols_buf_len = 0;
if ((url_stream_wrappers_hash =
php_stream_get_url_stream_wrappers_hash())) {
for
(zend_hash_internal_pointer_reset(url_stream_wrappers_hash);
--- php4-STABLE-200302241430/ext/standard/url_scanner_ex.c 2003-02-24
09:30:49.000000000 -0500
+++ php4-STABLE-200302241430.mod/ext/standard/url_scanner_ex.c 2003-02-27
14:25:13.000000000 -0500
@@ -831,7 +831,7 @@
}
-static char *url_adapt_ext(const char *src, size_t srclen, size_t *newlen, zend_bool
do_flush TSRMLS_DC)
+static char *url_adapt_ext(const char *src, uint srclen, uint *newlen, zend_bool
do_flush TSRMLS_DC)
{
url_adapt_state_ex_t *ctx;
char *retval;
--- php4-STABLE-200302241430/ext/sybase_ct/php_sybase_ct.c 2003-01-11
19:10:12.000000000 -0500
+++ php4-STABLE-200302241430.mod/ext/sybase_ct/php_sybase_ct.c 2003-02-27
14:25:13.000000000 -0500
@@ -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()
--- php4-STABLE-200302241430/main/main.c 2003-02-19 12:12:04.000000000 -0500
+++ php4-STABLE-200302241430.mod/main/main.c 2003-02-27 14:25:13.000000000 -0500
@@ -258,12 +258,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)
@@ -304,8 +304,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)
--- php4-STABLE-200302241430/sapi/apache/php_apache.c 2003-01-03 17:14:47.000000000
-0500
+++ php4-STABLE-200302241430.mod/sapi/apache/php_apache.c 2003-02-27
14:25:13.000000000 -0500
@@ -61,10 +61,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()
-- PHP Development Mailing List <http://www.php.net/> To unsubscribe, visit: http://www.php.net/unsub.php
