[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli.c branches/PHP_5_3/ext/mysqli/mysqli_priv.h branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps_codec.c trunk/ext/mysqli/mysqli.c trunk/ext/mysqli/m
andrey Wed, 06 Oct 2010 06:08:55 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304131
Log:
fix shadowing of parameters
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_priv.h
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps_codec.c
U php/php-src/trunk/ext/mysqli/mysqli.c
U php/php-src/trunk/ext/mysqli/mysqli_priv.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_ps_codec.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c 2010-10-06 00:44:53 UTC (rev 304130)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c 2010-10-06 06:08:55 UTC (rev 304131)
@@ -1274,12 +1274,12 @@
fci.retval_ptr_ptr = retval_ptr;
if (ctor_params Z_TYPE_P(ctor_params) != IS_NULL) {
if (Z_TYPE_P(ctor_params) == IS_ARRAY) {
- HashTable *ht = Z_ARRVAL_P(ctor_params);
+ HashTable *params_ht = Z_ARRVAL_P(ctor_params);
Bucket *p;
fci.param_count = 0;
- fci.params = safe_emalloc(sizeof(zval*), ht-nNumOfElements, 0);
- p = ht-pListHead;
+ fci.params = safe_emalloc(sizeof(zval*), params_ht-nNumOfElements, 0);
+ p = params_ht-pListHead;
while (p != NULL) {
fci.params[fci.param_count++] = (zval**)p-pData;
p = p-pListNext;
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_priv.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_priv.h 2010-10-06 00:44:53 UTC (rev 304130)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_priv.h 2010-10-06 06:08:55 UTC (rev 304131)
@@ -79,10 +79,10 @@
#endif
#define REGISTER_MYSQLI_CLASS_ENTRY(name, mysqli_entry, class_functions) { \
- zend_class_entry ce; \
- INIT_CLASS_ENTRY(ce, name,class_functions); \
- ce.create_object = mysqli_objects_new; \
- mysqli_entry = zend_register_internal_class(ce TSRMLS_CC); \
+ zend_class_entry tmp_ce; \
+ INIT_CLASS_ENTRY(tmp_ce, name,class_functions); \
+ tmp_ce.create_object = mysqli_objects_new; \
+ mysqli_entry = zend_register_internal_class(tmp_ce TSRMLS_CC); \
} \
#define PHP_MYSQLI_EXPORT(__type) PHP_MYSQLI_API __type
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps_codec.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps_codec.c 2010-10-06 00:44:53 UTC (rev 304130)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps_codec.c 2010-10-06 06:08:55 UTC (rev 304131)
@@ -231,7 +231,7 @@
{
struct st_mysqlnd_time t;
unsigned int length; /* First byte encodes the length*/
- char *to;
+ char * value;
DBG_ENTER(ps_fetch_time);
if ((length = php_mysqlnd_net_field_length(row))) {
@@ -262,17 +262,17 @@
QQ : How to make this unicode without copying two times the buffer -
Unicode equivalent of spprintf?
*/
- length = spprintf(to, 0, %s%02u:%02u:%02u, (t.neg ? - : ), t.hour, t.minute, t.second);
+ length = spprintf(value, 0, %s%02u:%02u:%02u, (t.neg ? - : ), t.hour, t.minute, t.second);
- DBG_INF_FMT(%s, to);
+ DBG_INF_FMT(%s, value);
#if MYSQLND_UNICODE
if (!as_unicode) {
#endif
- ZVAL_STRINGL(zv, to, length, 1);
- efree(to); /* allocated by spprintf */
+ ZVAL_STRINGL(zv, value, length, 1);
+ efree(value); /* allocated by spprintf */
#if MYSQLND_UNICODE
} else {
- ZVAL_UTF8_STRINGL(zv, to, length, ZSTR_AUTOFREE);
+ ZVAL_UTF8_STRINGL(zv, value, length, ZSTR_AUTOFREE);
}
#endif
DBG_VOID_RETURN;
@@ -288,7 +288,7 @@
{
struct st_mysqlnd_time t = {0};
unsigned int length; /* First byte encodes the length*/
- char *to;
+ char * value;
DBG_ENTER(ps_fetch_date);
if ((length = php_mysqlnd_net_field_length(row))) {
@@ -313,17 +313,17 @@
QQ : How to make this unicode without copying two times the buffer -
Unicode equivalent of spprintf?
*/
- length = spprintf(to, 0, %04u-%02u-%02u, t.year, t.month, t.day);
+ length = spprintf(value, 0, %04u-%02u-%02u, t.year, t.month, t.day);
- DBG_INF_FMT(%s, to);
+ DBG_INF_FMT(%s, value);
#if MYSQLND_UNICODE
if (!as_unicode) {
#endif
- ZVAL_STRINGL(zv, to, length, 1);
- efree(to); /* allocated by spprintf */
+ ZVAL_STRINGL(zv, value, length, 1);
+ efree(value); /* allocated by spprintf */
#if MYSQLND_UNICODE
} else {
- ZVAL_UTF8_STRINGL(zv, to, length, ZSTR_AUTOFREE);
+ ZVAL_UTF8_STRINGL(zv, value, length, ZSTR_AUTOFREE);
}
#endif
DBG_VOID_RETURN;
@@ -339,7 +339,7 @@
{
struct st_mysqlnd_time t;
unsigned int length; /* First byte encodes the length*/
- char *to;
+ char * value;
DBG_ENTER(ps_fetch_datetime);
if ((length = php_mysqlnd_net_field_length(row))) {
@@ -371,15 +371,15 @@
QQ : How to make this unicode without copying two times the buffer -
Unicode equivalent of spprintf?
*/
- length = spprintf(to, 0, %04u-%02u-%02u %02u:%02u:%02u,
+
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c trunk/ext/mysqlnd/mysqlnd_result.c
andrey Wed, 06 Oct 2010 07:09:37 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304134
Log:
more variable hiding fixes
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-10-06 06:17:42 UTC (rev 304133)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-10-06 07:09:37 UTC (rev 304134)
@@ -679,7 +679,7 @@
if (!row_packet-skip_extraction) {
MYSQLND_FIELD *field = result-meta-fields;
- struct mysqlnd_field_hash_key *zend_hash_key = result-meta-zend_hash_keys;
+ struct mysqlnd_field_hash_key * hash_key = result-meta-zend_hash_keys;
enum_func_status rc = result-m.row_decoder(result-unbuf-last_row_buffer,
result-unbuf-last_row_data,
@@ -695,7 +695,7 @@
retrow = mnd_malloc(result-field_count * sizeof(char *));
if (retrow) {
-for (i = 0; i field_count; i++, field++, zend_hash_key++) {
+for (i = 0; i field_count; i++, field++, hash_key++) {
zval *data = result-unbuf-last_row_data[i];
unsigned int len;
@@ -794,7 +794,7 @@
if (!row_packet-skip_extraction) {
HashTable *row_ht = Z_ARRVAL_P(row);
MYSQLND_FIELD *field = result-meta-fields;
- struct mysqlnd_field_hash_key *zend_hash_key = result-meta-zend_hash_keys;
+ struct mysqlnd_field_hash_key * hash_key = result-meta-zend_hash_keys;
unsigned int i, field_count = result-field_count;
unsigned long *lengths = result-lengths;
@@ -809,7 +809,7 @@
if (PASS != rc) {
DBG_RETURN(FAIL);
}
- for (i = 0; i field_count; i++, field++, zend_hash_key++) {
+ for (i = 0; i field_count; i++, field++, hash_key++) {
zval *data = result-unbuf-last_row_data[i];
unsigned int len = (Z_TYPE_P(data) == IS_NULL)? 0:Z_STRLEN_P(data);
@@ -830,23 +830,23 @@
hashing of the column name, which is not needed as it can be precomputed.
*/
Z_ADDREF_P(data);
- if (zend_hash_key-is_numeric == FALSE) {
+ if (hash_key-is_numeric == FALSE) {
#if MYSQLND_UNICODE
zend_u_hash_quick_update(Z_ARRVAL_P(row), IS_UNICODE,
- zend_hash_key-ustr,
- zend_hash_key-ulen + 1,
- zend_hash_key-key,
+ hash_key-ustr,
+ hash_key-ulen + 1,
+ hash_key-key,
(void *) data, sizeof(zval *), NULL);
#else
zend_hash_quick_update(Z_ARRVAL_P(row),
field-name,
field-name_length + 1,
- zend_hash_key-key,
+ hash_key-key,
(void *) data, sizeof(zval *), NULL);
#endif
} else {
zend_hash_index_update(Z_ARRVAL_P(row),
- zend_hash_key-key,
+ hash_key-key,
(void *) data, sizeof(zval *), NULL);
}
}
@@ -962,7 +962,7 @@
{
zval **current_row = set-data_cursor;
MYSQLND_FIELD *field = result-meta-fields;
- struct mysqlnd_field_hash_key *zend_hash_key = result-meta-zend_hash_keys;
+ struct mysqlnd_field_hash_key * hash_key = result-meta-zend_hash_keys;
unsigned int i;
if (NULL == current_row[0]) {
@@ -999,7 +999,7 @@
ret = mnd_malloc(result-field_count * sizeof(char *));
if (ret) {
- for (i = 0; i result-field_count; i++, field++, zend_hash_key++) {
+ for (i = 0; i result-field_count; i++, field++, hash_key++) {
zval *data = current_row[i];
if (Z_TYPE_P(data) != IS_NULL) {
@@ -1038,7 +1038,7 @@
{
zval **current_row = set-data_cursor;
MYSQLND_FIELD *field = result-meta-fields;
- struct mysqlnd_field_hash_key *zend_hash_key = result-meta-zend_hash_keys;
+ struct mysqlnd_field_hash_key * hash_key = result-meta-zend_hash_keys;
if (NULL == current_row[0]) {
uint64_t row_num = (set-data_cursor - set-data) / result-meta-field_count;
@@ -1069,7 +1069,7 @@
}
}
- for (i = 0; i result-field_count; i++, field++, zend_hash_key++) {
+ for (i = 0; i result-field_count; i++, field++, hash_key++) {
zval *data = current_row[i];
if (flags MYSQLND_FETCH_NUM) {
@@ -1085,23 +1085,23 @@
hashing of the column name, which is not needed as it can be precomputed.
*/
Z_ADDREF_P(data);
-if (zend_hash_key-is_numeric == FALSE) {
+if (hash_key-is_numeric == FALSE) {
#if MYSQLND_UNICODE
zend_u_hash_quick_update(Z_ARRVAL_P(row), IS_UNICODE,
- zend_hash_key-ustr,
- zend_hash_key-ulen + 1,
- zend_hash_key-key,
+ hash_key-ustr,
+ hash_key-ulen + 1,
+ hash_key-key,
(void *) data, sizeof(zval *), NULL);
#else
zend_hash_quick_update(Z_ARRVAL_P(row),
field-name,
field-name_length + 1,
- zend_hash_key-key,
+ hash_key-key,
[PHP-CVS] svn: /php/php-src/trunk/ext/gd/libgd/ webpimg.c
pajoye Wed, 06 Oct 2010 09:02:08 + Revision: http://svn.php.net/viewvc?view=revisionrevision=304135 Log: - don't build if no libvpx available Changed paths: U php/php-src/trunk/ext/gd/libgd/webpimg.c Modified: php/php-src/trunk/ext/gd/libgd/webpimg.c === --- php/php-src/trunk/ext/gd/libgd/webpimg.c2010-10-06 07:09:37 UTC (rev 304134) +++ php/php-src/trunk/ext/gd/libgd/webpimg.c2010-10-06 09:02:08 UTC (rev 304135) @@ -30,7 +30,8 @@ * * 6. AdjustColorspaceBack: */ - +#include gd.h +#ifdef HAVE_LIBVPX #include webpimg.h #include math.h @@ -896,3 +897,4 @@ } return webp_failure; } +#endif /* HAVE_LIBVPX */ -- 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/mysqli/ mysqli_priv.h
andrey Wed, 06 Oct 2010 10:35:02 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304140
Log:
fix broken merge, led to double define
Changed paths:
U php/php-src/trunk/ext/mysqli/mysqli_priv.h
Modified: php/php-src/trunk/ext/mysqli/mysqli_priv.h
===
--- php/php-src/trunk/ext/mysqli/mysqli_priv.h 2010-10-06 10:33:44 UTC (rev
304139)
+++ php/php-src/trunk/ext/mysqli/mysqli_priv.h 2010-10-06 10:35:02 UTC (rev
304140)
@@ -78,13 +78,6 @@
extern PHPAPI zend_class_entry *spl_ce_RuntimeException;
#endif
-#define REGISTER_MYSQLI_CLASS_ENTRY(name, mysqli_entry, class_functions) { \
- zend_class_entry tmp_ce; \
- INIT_CLASS_ENTRY(tmp_ce, name,class_functions); \
- tmp_ce.create_object = mysqli_objects_new; \
- mysqli_entry = zend_register_internal_class(tmp_ce TSRMLS_CC); \
-} \
-
#define PHP_MYSQLI_EXPORT(__type) PHP_MYSQLI_API __type
PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *
TSRMLS_DC);
--
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/mysqli/mysqli_api.c branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_attr_set.phpt branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c trunk/ext/mysqli/mysqli_api.
andrey Wed, 06 Oct 2010 11:11:02 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304146
Log:
Fix for Bug #52686 mysql_stmt_attr_[gs]et arg. points to incorrect type
Bug: http://bugs.php.net/52686 (Assigned) mysql_stmt_attr_[gs]et arg. points to
incorrect type
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_attr_set.phpt
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c
U php/php-src/trunk/ext/mysqli/mysqli_api.c
U php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_attr_set.phpt
U php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c 2010-10-06 11:07:15 UTC (rev 304145)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c 2010-10-06 11:11:02 UTC (rev 304146)
@@ -380,11 +380,11 @@
case MYSQL_TYPE_NEWDECIMAL:
#endif
{
-#if MYSQL_VERSION_ID 50099
+#if MYSQL_VERSION_ID = 50107
/* Changed to my_bool in MySQL 5.1. See MySQL Bug #16144 */
my_bool tmp;
#else
-ulong tmp = 0;
+uint tmp = 0;
#endif
stmt-result.buf[ofs].type = IS_STRING;
/*
@@ -2231,8 +2231,10 @@
MY_STMT *stmt;
zval *mysql_stmt;
long mode_in;
+ my_bool mode_b;
ulong mode;
ulong attr;
+ void *mode_p;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), Oll, mysql_stmt, mysqli_stmt_class_entry, attr, mode_in) == FAILURE) {
return;
@@ -2244,11 +2246,22 @@
RETURN_FALSE;
}
- mode = mode_in;
+ switch (attr) {
+#if MYSQL_VERSION_ID = 50107
+ case STMT_ATTR_UPDATE_MAX_LENGTH:
+ mode_b = (my_bool) mode_in;
+ mode_p = mode_b;
+ break;
+#endif
+ default:
+ mode = mode_in;
+ mode_p = mode;
+ break;
+ }
#if !defined(MYSQLI_USE_MYSQLND)
- if (mysql_stmt_attr_set(stmt-stmt, attr, (void *)mode)) {
+ if (mysql_stmt_attr_set(stmt-stmt, attr, mode_p)) {
#else
- if (FAIL == mysql_stmt_attr_set(stmt-stmt, attr, (void *)mode)) {
+ if (FAIL == mysql_stmt_attr_set(stmt-stmt, attr, mode_p)) {
#endif
RETURN_FALSE;
}
@@ -2262,11 +2275,7 @@
{
MY_STMT *stmt;
zval *mysql_stmt;
-#if !defined(MYSQLI_USE_MYSQLND) MYSQL_VERSION_ID 50099
- my_bool value;
-#else
ulong value = 0;
-#endif
ulong attr;
int rc;
@@ -2278,6 +2287,11 @@
if ((rc = mysql_stmt_attr_get(stmt-stmt, attr, value))) {
RETURN_FALSE;
}
+
+#if MYSQL_VERSION_ID = 50107
+ if (attr == STMT_ATTR_UPDATE_MAX_LENGTH)
+ value = *((my_bool *)value);
+#endif
RETURN_LONG((long)value);
}
/* }}} */
@@ -2423,7 +2437,11 @@
stmt-stmt-fields[i].type == MYSQL_TYPE_LONG_BLOB ||
stmt-stmt-fields[i].type == MYSQL_TYPE_GEOMETRY))
{
+#if MYSQL_VERSION_ID = 50107
my_bool tmp=1;
+#else
+uint tmp=1;
+#endif
mysql_stmt_attr_set(stmt-stmt, STMT_ATTR_UPDATE_MAX_LENGTH, tmp);
break;
}
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_attr_set.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_attr_set.phpt 2010-10-06 11:07:15 UTC (rev 304145)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_attr_set.phpt 2010-10-06 11:11:02 UTC (rev 304146)
@@ -92,6 +92,9 @@
$stmt = mysqli_stmt_init($link);
$stmt-prepare(SELECT label FROM test);
$stmt-attr_set(MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH, 1);
+ $res = $stmt-attr_get(MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH);
+ if ($res !== 1)
+ printf([007.1] max_length should be 1, got %s\n, $res);
$stmt-execute();
$stmt-store_result();
$res = $stmt-result_metadata();
@@ -109,6 +112,9 @@
$stmt = mysqli_stmt_init($link);
$stmt-prepare(SELECT label FROM test);
$stmt-attr_set(MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH, 0);
+ $res = $stmt-attr_get(MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH);
+ if ($res !== 0)
+ printf([008.1] max_length should be 0, got %s\n, $res);
$stmt-execute();
$stmt-store_result();
$res = $stmt-result_metadata();
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c 2010-10-06 11:07:15 UTC (rev 304145)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c 2010-10-06 11:11:02 UTC (rev 304146)
@@ -1827,39 +1827,42 @@
const void * const value TSRMLS_DC)
{
MYSQLND_STMT_DATA * stmt = s? s-data:NULL;
- unsigned long val = *(unsigned long *) value;
DBG_ENTER(mysqlnd_stmt::attr_set);
if (!stmt) {
DBG_RETURN(FAIL);
}
- DBG_INF_FMT(stmt=%lu attr_type=%u value=%lu, stmt-stmt_id, attr_type, val);
+ DBG_INF_FMT(stmt=%lu attr_type=%u, stmt-stmt_id, attr_type);
switch (attr_type) {
- case STMT_ATTR_UPDATE_MAX_LENGTH:
+ case STMT_ATTR_UPDATE_MAX_LENGTH:{
+ zend_uchar bval = *(zend_uchar *) value;
/*
XXX :
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
andrey Wed, 06 Oct 2010 11:12:53 + Revision: http://svn.php.net/viewvc?view=revisionrevision=304147 Log: here comes the news Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2010-10-06 11:11:02 UTC (rev 304146) +++ php/php-src/branches/PHP_5_3/NEWS 2010-10-06 11:12:53 UTC (rev 304147) @@ -63,6 +63,8 @@ CASE-WHEN). (Andrey) - Fixed bug #52699 (PDO bindValue writes long int 32bit enum). (rein at basefarm dot no) +- Fixed bug #52686 (mysql_stmt_attr_[gs]et argument points to incorrect type). + (rein at basefarm dot no) - Fixed bug #52681 (mb_send_mail() appends an extra MIME-Version header). (Adam) - Fixed bug #52674 (FPM Status page returns inconsistent Content-Type headers). -- 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/intl/tests/bug50590.phpt trunk/ext/intl/tests/bug50590.phpt
cataphract Wed, 06 Oct 2010 17:05:05 + Revision: http://svn.php.net/viewvc?view=revisionrevision=304164 Log: - Fixed test for bug #50590 on systems with 64-bit longs. Bug: http://bugs.php.net/50590 (Closed) IntlDateFormatter::parse result is limited to the integer range Changed paths: U php/php-src/branches/PHP_5_3/ext/intl/tests/bug50590.phpt U php/php-src/trunk/ext/intl/tests/bug50590.phpt Modified: php/php-src/branches/PHP_5_3/ext/intl/tests/bug50590.phpt === --- php/php-src/branches/PHP_5_3/ext/intl/tests/bug50590.phpt 2010-10-06 16:26:56 UTC (rev 304163) +++ php/php-src/branches/PHP_5_3/ext/intl/tests/bug50590.phpt 2010-10-06 17:05:05 UTC (rev 304164) @@ -10,4 +10,4 @@ ? --EXPECTF-- -float(2147570047) +%s(2147570047) Modified: php/php-src/trunk/ext/intl/tests/bug50590.phpt === --- php/php-src/trunk/ext/intl/tests/bug50590.phpt 2010-10-06 16:26:56 UTC (rev 304163) +++ php/php-src/trunk/ext/intl/tests/bug50590.phpt 2010-10-06 17:05:05 UTC (rev 304164) @@ -10,4 +10,4 @@ ? --EXPECTF-- -float(2147570047) +%s(2147570047) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
