[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct.phpt trunk/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
johannes Thu, 21 Jan 2010 13:30:46 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=293804
Log:
Overlong hostnames breakthistest on NIS enabled FreeBSD
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
U php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
Modified:
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
2010-01-21 08:25:46 UTC (rev 293803)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
2010-01-21 13:30:46 UTC (rev 293804)
@@ -101,7 +101,8 @@
}
// what about long values for a valid option ...
- $dsn = MySQLPDOTest::getDSN(array('host' =
str_repeat('0123456789', 1024 * 100)));
+ // hostnames 1024 chars break on some NIS-enabled FreeBSD...
+ $dsn = MySQLPDOTest::getDSN(array('host' =
str_repeat('0123456789', 100)));
try { $db = @new PDO($dsn, $user, $pass); assert(false);
printf(%s\n, $dsn); } catch (PDOException $e) {
$tmp = $e-getMessage();
if (!stristr($tmp, 'HY000') !stristr($tmp, '2005')
!stristr($tmp, '2002'))
@@ -296,4 +297,4 @@
[009] SQLSTATE[28000] [1045] Access denied for user 'dont%s'@'%s' (using
password: YES), [n/a] n/a
[010] SQLSTATE[28000] [1045] Access denied for user 'dont%s'@'%s' (using
password: YES), [n/a] n/a
[017] DSN=%s, SQLSTATE[%s] [%d] %s
-[033] DSN = mysql:%s, character sets has not been set,
@@character_set_connection reports 'latin1', expecting 'latin2'done!
\ No newline at end of file
+[033] DSN = mysql:%s, character sets has not been set,
@@character_set_connection reports 'latin1', expecting 'latin2'done!
Modified: php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
===
--- php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
2010-01-21 08:25:46 UTC (rev 293803)
+++ php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
2010-01-21 13:30:46 UTC (rev 293804)
@@ -101,7 +101,8 @@
}
// what about long values for a valid option ...
- $dsn = MySQLPDOTest::getDSN(array('host' =
str_repeat('0123456789', 1024 * 100)));
+ // hostnames 1024 chars break on some NIS-enabled FreeBSD...
+ $dsn = MySQLPDOTest::getDSN(array('host' =
str_repeat('0123456789', 100)));
try { $db = @new PDO($dsn, $user, $pass); assert(false);
printf(%s\n, $dsn); } catch (PDOException $e) {
$tmp = $e-getMessage();
if (!stristr($tmp, 'HY000') !stristr($tmp, '2005')
!stristr($tmp, '2002'))
@@ -296,4 +297,4 @@
[009] SQLSTATE[28000] [1045] Access denied for user 'dont%s'@'%s' (using
password: YES), [n/a] n/a
[010] SQLSTATE[28000] [1045] Access denied for user 'dont%s'@'%s' (using
password: YES), [n/a] n/a
[017] DSN=%s, SQLSTATE[%s] [%d] %s
-[033] DSN = mysql:%s, character sets has not been set,
@@character_set_connection reports 'latin1', expecting 'latin2'done!
\ No newline at end of file
+[033] DSN = mysql:%s, character sets has not been set,
@@character_set_connection reports 'latin1', expecting 'latin2'done!
--
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_2/NEWS branches/PHP_5_2/ext/pcre/pcrelib/AUTHORS branches/PHP_5_2/ext/pcre/pcrelib/ChangeLog branches/PHP_5_2/ext/pcre/pcrelib/HACKING branches/PHP_5_2/ext/
iliaaThu, 21 Jan 2010 17:49:38 + Revision: http://svn.php.net/viewvc?view=revisionrevision=293812 Log: Upgraded bundled PCRE to version 8.01 Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/AUTHORS U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/ChangeLog U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/HACKING U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/LICENCE U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/NEWS U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/NON-UNIX-USE U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/README U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/config.h U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/doc/pcre.txt U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/pcre.h U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/pcre_compile.c U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/pcre_exec.c U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/pcre_fullinfo.c U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/pcre_internal.h U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/pcre_printint.src U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/pcre_study.c U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/pcre_try_flipped.c U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/pcre_ucd.c U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/pcredemo.c U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/pcregrep.c U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/pcreposix.c U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/pcreposix.h U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/grepoutput U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testinput1 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testinput10 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testinput2 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testinput3 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testinput4 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testinput5 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testinput6 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testinput7 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testinput8 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testinput9 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testoutput1 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testoutput10 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testoutput2 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testoutput3 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testoutput4 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testoutput5 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testoutput6 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testoutput7 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testoutput8 U php/php-src/branches/PHP_5_2/ext/pcre/pcrelib/testdata/testoutput9 U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/AUTHORS U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/ChangeLog U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/LICENCE U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/NEWS U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/NON-UNIX-USE U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/README U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/config.h U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/doc/pcre.txt U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre.h U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_compile.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_exec.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_printint.src U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_study.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcredemo.c U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput1 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput2 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput5 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testinput7 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput1 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput2 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput5 U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/testdata/testoutput7 U php/php-src/trunk/ext/pcre/pcrelib/AUTHORS U php/php-src/trunk/ext/pcre/pcrelib/ChangeLog U
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.c branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_iterator.c trunk/ext/intl/resourcebundle/resourcebu
stas Thu, 21 Jan 2010 18:07:28 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=293813
Log:
fix TS build
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.c
U
php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_iterator.c
U php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.c
U php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_iterator.c
Modified:
php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.c
===
--- php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.c
2010-01-21 17:49:38 UTC (rev 293812)
+++ php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.c
2010-01-21 18:07:28 UTC (rev 293813)
@@ -87,7 +87,7 @@
char *pbuf;
zval *object = return_value;
- ResourceBundle_object *rb = (ResourceBundle_object *)
zend_object_store_get_object( object );
+ ResourceBundle_object *rb = (ResourceBundle_object *)
zend_object_store_get_object( object TSRMLS_CC);
intl_error_reset( NULL TSRMLS_CC );
@@ -247,7 +247,7 @@
/* {{{ resourcebundle_array_count */
int resourcebundle_array_count(zval *object, long *count TSRMLS_DC)
{
- ResourceBundle_object *rb = (ResourceBundle_object *)
zend_object_store_get_object( object );
+ ResourceBundle_object *rb = (ResourceBundle_object *)
zend_object_store_get_object( object TSRMLS_CC);
*count = ures_getSize( rb-me );
Modified:
php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_iterator.c
===
---
php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_iterator.c
2010-01-21 17:49:38 UTC (rev 293812)
+++
php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_iterator.c
2010-01-21 18:07:28 UTC (rev 293813)
@@ -94,7 +94,7 @@
{
ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
if (!iterator-current) {
- resourcebundle_iterator_read( iterator );
+ resourcebundle_iterator_read( iterator TSRMLS_CC);
}
*data = iterator-current;
}
@@ -106,7 +106,7 @@
ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
if (!iterator-current) {
- resourcebundle_iterator_read( iterator );
+ resourcebundle_iterator_read( iterator TSRMLS_CC);
}
if (iterator-is_table) {
*str_key = estrdup( iterator-currentkey );
Modified: php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.c
===
--- php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.c
2010-01-21 17:49:38 UTC (rev 293812)
+++ php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.c
2010-01-21 18:07:28 UTC (rev 293813)
@@ -86,7 +86,7 @@
char *pbuf;
zval *object = return_value;
- ResourceBundle_object *rb = (ResourceBundle_object *)
zend_object_store_get_object( object );
+ ResourceBundle_object *rb = (ResourceBundle_object *)
zend_object_store_get_object( object TSRMLS_CC);
intl_error_reset( NULL TSRMLS_CC );
@@ -253,7 +253,7 @@
/* {{{ resourcebundle_array_count */
int resourcebundle_array_count(zval *object, long *count TSRMLS_DC)
{
- ResourceBundle_object *rb = (ResourceBundle_object *)
zend_object_store_get_object( object );
+ ResourceBundle_object *rb = (ResourceBundle_object *)
zend_object_store_get_object( object TSRMLS_CC);
*count = ures_getSize( rb-me );
Modified: php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_iterator.c
===
--- php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_iterator.c
2010-01-21 17:49:38 UTC (rev 293812)
+++ php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_iterator.c
2010-01-21 18:07:28 UTC (rev 293813)
@@ -94,7 +94,7 @@
{
ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
if (!iterator-current) {
- resourcebundle_iterator_read( iterator );
+ resourcebundle_iterator_read( iterator TSRMLS_CC);
}
*data = iterator-current;
}
@@ -106,7 +106,7 @@
ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
if (!iterator-current) {
- resourcebundle_iterator_read( iterator );
+ resourcebundle_iterator_read( iterator TSRMLS_CC);
}
if (iterator-is_table) {
*str_key = estrdup( iterator-currentkey );
--
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/mysqlnd/mysqlnd_debug.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h trunk/ext/mysqlnd/mysqlnd_debug.c trunk/ext/mysqlnd/mysqlnd_debug.h
andrey Thu, 21 Jan 2010 18:12:18 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=293815
Log:
Add possibility to restrain the number of levels
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-01-21
18:08:30 UTC (rev 293814)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-01-21
18:12:18 UTC (rev 293815)
@@ -1113,11 +1113,17 @@
long line;
HashTable *ht = Z_ARRVAL_PP(frame);
zval **file, **tmp;
+ uint * level;
+ level = va_arg(args, uint *);
str = va_arg(args, char**);
len = va_arg(args, int*);
num = va_arg(args, int*);
+ if (!(*level)--) {
+ return ZEND_HASH_APPLY_KEEP;
+ }
+
s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 1 + 1);
sprintf(s_tmp, #%d , (*num)++);
TRACE_APPEND_STRL(s_tmp, strlen(s_tmp));
@@ -1283,11 +1289,17 @@
long line;
HashTable *ht = Z_ARRVAL_PP(frame);
zval **file, **tmp;
+ uint * level;
+ level = va_arg(args, uint *);
str = va_arg(args, char**);
len = va_arg(args, int*);
num = va_arg(args, int*);
+ if (!(*level)--) {
+ return ZEND_HASH_APPLY_KEEP;
+ }
+
s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 1 + 1);
sprintf(s_tmp, #%d , (*num)++);
TRACE_APPEND_STRL(s_tmp, strlen(s_tmp));
@@ -1323,24 +1335,30 @@
#endif
-char * mysqlnd_get_backtrace(TSRMLS_D)
+PHPAPI char * mysqlnd_get_backtrace(uint max_levels, size_t * length TSRMLS_DC)
{
zval *trace;
char *res = estrdup(), **str = res, *s_tmp;
int res_len = 0, *len = res_len, num = 0;
+ if (max_levels == 0) {
+ max_levels = 9;
+ }
MAKE_STD_ZVAL(trace);
zend_fetch_debug_backtrace(trace, 0, 0 TSRMLS_CC);
- zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC,
(apply_func_args_t)mysqlnd_build_trace_string, 3, str, len, num);
+ zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC,
(apply_func_args_t)mysqlnd_build_trace_string, 4, max_levels, str, len, num);
zval_ptr_dtor(trace);
- s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 7 + 1);
- sprintf(s_tmp, #%d {main}, num);
- TRACE_APPEND_STRL(s_tmp, strlen(s_tmp));
- efree(s_tmp);
+ if (max_levels) {
+ s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 7 + 1);
+ sprintf(s_tmp, #%d {main}, num);
+ TRACE_APPEND_STRL(s_tmp, strlen(s_tmp));
+ efree(s_tmp);
+ }
res[res_len] = '\0';
+ *length = res_len;
return res;
}
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h2010-01-21
18:08:30 UTC (rev 293814)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h2010-01-21
18:12:18 UTC (rev 293815)
@@ -78,7 +78,7 @@
PHPAPI void * _mysqlnd_realloc(void *ptr, size_t new_size MYSQLND_MEM_D);
PHPAPI void_mysqlnd_free(void *ptr MYSQLND_MEM_D);
-PHPAPI char * mysqlnd_get_backtrace(TSRMLS_D);
+PHPAPI char * mysqlnd_get_backtrace(uint max_levels, size_t * length
TSRMLS_DC);
#if defined(__GNUC__)
#define DBG_INF_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)-m-log((dbg_obj), __LINE__, __FILE__, -1, info : , (msg));
} while (0)
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-01-21 18:08:30 UTC
(rev 293814)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-01-21 18:12:18 UTC
(rev 293815)
@@ -1113,11 +1113,17 @@
long line;
HashTable *ht = Z_ARRVAL_PP(frame);
zval **file, **tmp;
+ uint * level;
+ level = va_arg(args, uint *);
str = va_arg(args, char**);
len = va_arg(args, int*);
num = va_arg(args, int*);
+ if (!(*level)--) {
+ return ZEND_HASH_APPLY_KEEP;
+ }
+
s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 1 + 1);
sprintf(s_tmp, #%d , (*num)++);
TRACE_APPEND_STRL(s_tmp, strlen(s_tmp));
@@ -1283,11 +1289,17 @@
long line;
HashTable *ht = Z_ARRVAL_PP(frame);
zval **file, **tmp;
+ uint * level;
+ level = va_arg(args, uint *);
str = va_arg(args, char**);
len = va_arg(args, int*);
num = va_arg(args, int*);
+ if
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c trunk/ext/mysqlnd/mysqlnd_debug.c
andrey Thu, 21 Jan 2010 18:17:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=293816
Log:
decrement correctly!
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-01-21
18:12:18 UTC (rev 293815)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-01-21
18:17:19 UTC (rev 293816)
@@ -1120,9 +1120,10 @@
len = va_arg(args, int*);
num = va_arg(args, int*);
- if (!(*level)--) {
+ if (!*level) {
return ZEND_HASH_APPLY_KEEP;
}
+ --*level;
s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 1 + 1);
sprintf(s_tmp, #%d , (*num)++);
@@ -1296,9 +1297,10 @@
len = va_arg(args, int*);
num = va_arg(args, int*);
- if (!(*level)--) {
+ if (!*level) {
return ZEND_HASH_APPLY_KEEP;
}
+ --*level;
s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 1 + 1);
sprintf(s_tmp, #%d , (*num)++);
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-01-21 18:12:18 UTC
(rev 293815)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-01-21 18:17:19 UTC
(rev 293816)
@@ -1120,9 +1120,10 @@
len = va_arg(args, int*);
num = va_arg(args, int*);
- if (!(*level)--) {
+ if (!*level) {
return ZEND_HASH_APPLY_KEEP;
}
+ --*level;
s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 1 + 1);
sprintf(s_tmp, #%d , (*num)++);
@@ -1296,9 +1297,10 @@
len = va_arg(args, int*);
num = va_arg(args, int*);
- if (!(*level)--) {
+ if (!*level) {
return ZEND_HASH_APPLY_KEEP;
}
+ --*level;
s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 1 + 1);
sprintf(s_tmp, #%d , (*num)++);
--
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/pcre/pcrelib/pcre_internal.h trunk/ext/pcre/pcrelib/pcre_internal.h
pajoye Thu, 21 Jan 2010 23:23:17 + Revision: http://svn.php.net/viewvc?view=revisionrevision=293825 Log: - fix win build, use bundled stdint Changed paths: U php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h U php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h Modified: php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h === --- php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h 2010-01-21 22:58:08 UTC (rev 293824) +++ php/php-src/branches/PHP_5_3/ext/pcre/pcrelib/pcre_internal.h 2010-01-21 23:23:17 UTC (rev 293825) @@ -192,7 +192,11 @@ may be set by configure. */ #if HAVE_STDINT_H -#include stdint.h +# ifdef PHP_WIN32 +# include win32/php_stdint.h +# else +# include stdint.h +# endif #endif #if defined INT64_MAX || defined int64_t Modified: php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h === --- php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h 2010-01-21 22:58:08 UTC (rev 293824) +++ php/php-src/trunk/ext/pcre/pcrelib/pcre_internal.h 2010-01-21 23:23:17 UTC (rev 293825) @@ -192,7 +192,11 @@ may be set by configure. */ #if HAVE_STDINT_H -#include stdint.h +# ifdef PHP_WIN32 +# include win32/php_stdint.h +# else +# include stdint.h +# endif #endif #if defined INT64_MAX || defined int64_t -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
