Re: [PHP-CVS] svn: /php/php-src/trunk/ Zend/zend.c Zend/zend_compile.c Zend/zend_globals.h Zend/zend_language_scanner.c Zend/zend_language_scanner.h Zend/zend_language_scanner.l Zend/zend_language_sca
Hi Moriyoshi, Sorry, but I'll have to revert your patches to make ext/mbstring work again. I'm going do it on Wednesday. Please respond if you are going to fix it your self. Thanks. Dmitry. On 01/13/2011 05:32 PM, Dmitry Stogov wrote: Hi Moriyoshi, I just came from long vacation and found most of the ext/mbstring related tests failed. Looking into the problems I found a lot of places where PHP crashes because of NULL pointer deference. Some other tests produce incorrect output. Have you tried to run make test with your patch? Could you please fix the bugs you introduced or revert the patch. I've attached a patch that fixes some of mbstring crashes. Thanks. Dmitry. On 12/19/2010 07:36 PM, Moriyoshi Koizumi wrote: moriyoshi Sun, 19 Dec 2010 16:36:37 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306453 Log: * Refactor zend_multibyte facility. Now mbstring.script_encoding is superseded by zend.script_encoding. Changed paths: changed paths exceeded maximum size -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd.c mysqlnd_auth.c mysqlnd_priv.h
andrey Mon, 24 Jan 2011 13:58:18 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=307711
Log:
small cleanups
Changed paths:
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_priv.h
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-01-24 12:34:47 UTC (rev
307710)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-01-24 13:58:18 UTC (rev
307711)
@@ -577,7 +577,7 @@
plugin_data, plugin_data_len, options, mysql_flags
TSRMLS_CC);
- ret = mysqlnd_auth_handshake(conn, user,
passwd, db, db_len, passwd_len, options, mysql_flags, greet_packet-charset_no,
+ ret = mysqlnd_auth_handshake(conn, user,
passwd, passwd_len, db, db_len, options, mysql_flags, greet_packet-charset_no,
first_call,
requested_protocol,
scrambled_data, scrambled_data_len,
@@ -2084,7 +2084,7 @@
plugin_data, plugin_data_len, 0,
conn-server_capabilities TSRMLS_CC);
- ret = mysqlnd_auth_change_user(conn, user,
strlen(user), passwd, db, strlen(db), passwd_len, silent,
+ ret = mysqlnd_auth_change_user(conn, user,
strlen(user), passwd, passwd_len, db, strlen(db), silent,
first_call,
requested_protocol,
scrambled_data, scrambled_data_len,
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c2011-01-24 12:34:47 UTC
(rev 307710)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c2011-01-24 13:58:18 UTC
(rev 307711)
@@ -34,9 +34,9 @@
mysqlnd_auth_handshake(MYSQLND * conn,
const char * const
user,
const char * const
passwd,
+ const size_t
passwd_len,
const char * const db,
const size_t db_len,
- const size_t
passwd_len,
const MYSQLND_OPTIONS
* const options,
unsigned long
mysql_flags,
unsigned int
server_charset_no,
@@ -158,9 +158,9 @@
const char *
const user,
const size_t
user_len,
const char *
const passwd,
+ const size_t
passwd_len,
const char *
const db,
const size_t
db_len,
- const size_t
passwd_len,
const zend_bool
silent,
zend_bool
use_full_blown_auth_packet,
const char *
const auth_protocol,
@@ -172,14 +172,7 @@
size_t *
switch_to_auth_protocol_data_len
TSRMLS_DC)
{
- /*
- User could be max 16 * 3 (utf8), pass is 20 usually, db is up to 64*3
- Stack space is not that expensive, so use a bit more to be protected
against
- buffer overflows.
- */
enum_func_status ret = FAIL;
- char buffer[MYSQLND_MAX_ALLOWED_USER_LEN + 1 + SCRAMBLE_LENGTH +
MYSQLND_MAX_ALLOWED_DB_LEN + 1 + 2 /* charset*/ ];
- char *p = buffer;
const MYSQLND_CHARSET
[PHP-CVS] svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd_auth.c
andrey Mon, 24 Jan 2011 13:59:28 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=307712
Log:
fix typos
Changed paths:
U php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c2011-01-24 13:58:18 UTC
(rev 307711)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c2011-01-24 13:59:28 UTC
(rev 307712)
@@ -439,10 +439,10 @@
{
{
MYSQLND_PLUGIN_API_VERSION,
- auth_plugin_authentication_pam,
+ auth_plugin_mysql_clear_password,
MYSQLND_VERSION_ID,
MYSQLND_VERSION,
- Proprietatry,
+ PHP License 3.01,
Andrey Hristov and...@mysql.com, Ulf Wendel
uwen...@mysql.com, Georg Richter ge...@mysql.com,
{
NULL, /* no statistics , will be filled later if there
are some */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/date/lib/timezonedb.h trunk/ext/date/lib/timezonedb.h
derick Mon, 24 Jan 2011 16:45:56 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=307714
Log:
- Updated to version 2011.1 (2011a)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/date/lib/timezonedb.h
U php/php-src/trunk/ext/date/lib/timezonedb.h
Modified: php/php-src/branches/PHP_5_3/ext/date/lib/timezonedb.h
===
--- php/php-src/branches/PHP_5_3/ext/date/lib/timezonedb.h 2011-01-24 14:04:04 UTC (rev 307713)
+++ php/php-src/branches/PHP_5_3/ext/date/lib/timezonedb.h 2011-01-24 16:45:56 UTC (rev 307714)
@@ -513,63 +513,63 @@
{ Pacific/Guadalcanal , 0x03AA22 },
{ Pacific/Guam , 0x03AA77 },
{ Pacific/Honolulu , 0x03AACD },
- { Pacific/Johnston , 0x03AB61 },
- { Pacific/Kiritimati, 0x03ABB3 },
- { Pacific/Kosrae, 0x03AC1E },
- { Pacific/Kwajalein , 0x03AC7B },
- { Pacific/Majuro, 0x03ACE7 },
- { Pacific/Marquesas , 0x03AD46 },
- { Pacific/Midway, 0x03ADAD },
- { Pacific/Nauru , 0x03AE37 },
- { Pacific/Niue , 0x03AEAF },
- { Pacific/Norfolk , 0x03AF0D },
- { Pacific/Noumea, 0x03AF62 },
- { Pacific/Pago_Pago , 0x03AFF2 },
- { Pacific/Palau , 0x03B07B },
- { Pacific/Pitcairn , 0x03B0BF },
- { Pacific/Pohnpei , 0x03B114 },
- { Pacific/Ponape, 0x03B169 },
- { Pacific/Port_Moresby , 0x03B1AE },
- { Pacific/Rarotonga , 0x03B1F2 },
- { Pacific/Saipan, 0x03B2CE },
- { Pacific/Samoa , 0x03B331 },
- { Pacific/Tahiti, 0x03B3BA },
- { Pacific/Tarawa, 0x03B41F },
- { Pacific/Tongatapu , 0x03B473 },
- { Pacific/Truk , 0x03B4FF },
- { Pacific/Wake , 0x03B544 },
- { Pacific/Wallis, 0x03B594 },
- { Pacific/Yap , 0x03B5D8 },
- { Poland, 0x03B61D },
- { Portugal , 0x03B9FE },
- { PRC , 0x03BEFA },
- { PST8PDT , 0x03BFAB },
- { ROC , 0x03C2FC },
- { ROK , 0x03C414 },
- { Singapore , 0x03C4B8 },
- { Turkey, 0x03C56F },
- { UCT , 0x03C95C },
- { Universal , 0x03C9A0 },
- { US/Alaska , 0x03C9E4 },
- { US/Aleutian , 0x03CD4D },
- { US/Arizona, 0x03D0B3 },
- { US/Central, 0x03D141 },
- { US/East-Indiana , 0x03DB4B },
- { US/Eastern, 0x03D64C },
- { US/Hawaii , 0x03DDB5 },
- { US/Indiana-Starke , 0x03DE43 },
- { US/Michigan , 0x03E1B4 },
- { US/Mountain , 0x03E4EB },
- { US/Pacific, 0x03E864 },
- { US/Pacific-New, 0x03EC69 },
- { US/Samoa , 0x03F06E },
- { UTC , 0x03F0F7 },
- { W-SU , 0x03F3EE },
- { WET , 0x03F13B },
- { Zulu , 0x03F729 },
+ { Pacific/Johnston , 0x03AB44 },
+ { Pacific/Kiritimati, 0x03AB96 },
+ { Pacific/Kosrae, 0x03AC01 },
+ { Pacific/Kwajalein , 0x03AC5E },
+ { Pacific/Majuro, 0x03ACCA },
+ { Pacific/Marquesas , 0x03AD29 },
+ { Pacific/Midway, 0x03AD90 },
+ { Pacific/Nauru , 0x03AE1A },
+ { Pacific/Niue , 0x03AE92 },
+ { Pacific/Norfolk , 0x03AEF0 },
+ { Pacific/Noumea, 0x03AF45 },
+ { Pacific/Pago_Pago , 0x03AFD5 },
+ { Pacific/Palau , 0x03B05E },
+ { Pacific/Pitcairn , 0x03B0A2 },
+ { Pacific/Pohnpei , 0x03B0F7 },
+ { Pacific/Ponape, 0x03B14C },
+ { Pacific/Port_Moresby , 0x03B191 },
+ { Pacific/Rarotonga , 0x03B1D5 },
+ { Pacific/Saipan, 0x03B2B1 },
+ { Pacific/Samoa , 0x03B314 },
+ { Pacific/Tahiti, 0x03B39D },
+ { Pacific/Tarawa, 0x03B402 },
+ { Pacific/Tongatapu , 0x03B456 },
+ { Pacific/Truk , 0x03B4E2 },
+ { Pacific/Wake , 0x03B527 },
+ { Pacific/Wallis, 0x03B577 },
+ { Pacific/Yap
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/date/php_date.c trunk/ext/date/php_date.c
iliaaMon, 24 Jan 2011 20:58:09 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=307719
Log:
removed un-used variable
Changed paths:
U php/php-src/branches/PHP_5_3/ext/date/php_date.c
U php/php-src/trunk/ext/date/php_date.c
Modified: php/php-src/branches/PHP_5_3/ext/date/php_date.c
===
--- php/php-src/branches/PHP_5_3/ext/date/php_date.c2011-01-24 19:17:45 UTC
(rev 307718)
+++ php/php-src/branches/PHP_5_3/ext/date/php_date.c2011-01-24 20:58:09 UTC
(rev 307719)
@@ -3527,7 +3527,6 @@
{
php_interval_obj *obj;
zval tmp_member, tmp_value;
- int found = 0;
if (member-type != IS_STRING) {
tmp_member = *member;
Modified: php/php-src/trunk/ext/date/php_date.c
===
--- php/php-src/trunk/ext/date/php_date.c 2011-01-24 19:17:45 UTC (rev
307718)
+++ php/php-src/trunk/ext/date/php_date.c 2011-01-24 20:58:09 UTC (rev
307719)
@@ -3522,7 +3522,6 @@
{
php_interval_obj *obj;
zval tmp_member, tmp_value;
- int found = 0;
if (member-type != IS_STRING) {
tmp_member = *member;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
