[PHP-CVS] svn: /php/php-src/trunk/ NEWS UPGRADING ext/spl/internal/regexiterator.inc ext/spl/spl_iterators.c ext/spl/spl_iterators.h ext/spl/tests/regexiterator_getregex.phpt
aharvey Thu, 06 Jan 2011 02:32:02 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307147
Log:
Implement request #53659 (Implementing RegexIterator::getRegex() method). Patch
by Joshua Thijssen.
Bug: http://bugs.php.net/53659 (Assigned) Implementing
RegexIterator::getRegex() method
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/UPGRADING
U php/php-src/trunk/ext/spl/internal/regexiterator.inc
U php/php-src/trunk/ext/spl/spl_iterators.c
U php/php-src/trunk/ext/spl/spl_iterators.h
A php/php-src/trunk/ext/spl/tests/regexiterator_getregex.phpt
Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS 2011-01-06 02:24:49 UTC (rev 307146)
+++ php/php-src/trunk/NEWS 2011-01-06 02:32:02 UTC (rev 307147)
@@ -182,6 +182,7 @@
either is present at compile time. (Rasmus)
- Improved SPL extension:
+ . Added RegexIterator::getRegex() method. (Joshua Thijssen)
. Added SplObjectStorage::getHash() hook. (Etienne)
. Added SplFileInfo::getExtension(). FR #48767. (Peter Cowburn)
Modified: php/php-src/trunk/UPGRADING
===
--- php/php-src/trunk/UPGRADING 2011-01-06 02:24:49 UTC (rev 307146)
+++ php/php-src/trunk/UPGRADING 2011-01-06 02:32:02 UTC (rev 307147)
@@ -353,6 +353,9 @@
- ReflectionClass::getTraitAliases()
- ReflectionParameter::canBePassedByValue()
+ - RegexIterator
+ - RegexIterator::getRegex()
+
- PDO_dblib
- PDO::newRowset()
Modified: php/php-src/trunk/ext/spl/internal/regexiterator.inc
===
--- php/php-src/trunk/ext/spl/internal/regexiterator.inc2011-01-06
02:24:49 UTC (rev 307146)
+++ php/php-src/trunk/ext/spl/internal/regexiterator.inc2011-01-06
02:32:02 UTC (rev 307147)
@@ -158,6 +158,13 @@
{
$this->preg_flags = $preg_flags;
}
+
+ /** @return current regular expression
+ */
+ function getRegex()
+ {
+ return $this->regex;
+ }
}
?>
Modified: php/php-src/trunk/ext/spl/spl_iterators.c
===
--- php/php-src/trunk/ext/spl/spl_iterators.c 2011-01-06 02:24:49 UTC (rev
307146)
+++ php/php-src/trunk/ext/spl/spl_iterators.c 2011-01-06 02:32:02 UTC (rev
307147)
@@ -1465,6 +1465,7 @@
}
intern->u.regex.mode = mode;
intern->u.regex.regex = estrndup(regex, regex_len);
+ intern->u.regex.regex_len = regex_len;
intern->u.regex.pce =
pcre_get_compiled_regex_cache(regex, regex_len TSRMLS_CC);
if (intern->u.regex.pce == NULL) {
/* pcre_get_compiled_regex_cache has already
sent error */
@@ -1941,6 +1942,19 @@
}
} /* }}} */
+/* {{{ proto string RegexIterator::getRegex()
+ Returns current regular expression */
+SPL_METHOD(RegexIterator, getRegex)
+{
+ spl_dual_it_object *intern =
(spl_dual_it_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
+
+ RETURN_STRINGL(intern->u.regex.regex, intern->u.regex.regex_len, 1);
+} /* }}} */
+
/* {{{ proto bool RegexIterator::getMode()
Returns current operation mode */
SPL_METHOD(RegexIterator, getMode)
@@ -2205,6 +2219,7 @@
SPL_ME(RegexIterator, setFlags, arginfo_regex_it_set_flags,
ZEND_ACC_PUBLIC)
SPL_ME(RegexIterator, getPregFlags, arginfo_recursive_it_void,
ZEND_ACC_PUBLIC)
SPL_ME(RegexIterator, setPregFlags,
arginfo_regex_it_set_preg_flags, ZEND_ACC_PUBLIC)
+ SPL_ME(RegexIterator, getRegex, arginfo_recursive_it_void,
ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
Modified: php/php-src/trunk/ext/spl/spl_iterators.h
===
--- php/php-src/trunk/ext/spl/spl_iterators.h 2011-01-06 02:24:49 UTC (rev
307146)
+++ php/php-src/trunk/ext/spl/spl_iterators.h 2011-01-06 02:32:02 UTC (rev
307147)
@@ -154,6 +154,7 @@
long preg_flags;
pcre_cache_entry *pce;
char *regex;
+ uint regex_len;
} regex;
#endif
} u;
Added: php/php-src/trunk/ext/spl/tests/regexiterator_getregex.phpt
===
--- php/php-src/trunk/ext/spl/tests/regexiterator_getregex.phpt
(rev 0)
+++ php/php-src/trunk/ext/spl/tests/regexiterator_getregex.phpt 2011-01-06
02:32:02 UTC (rev 307147)
@@ -0,0 +1,29 @@
+--TEST--
+SP
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/spl/tests/bug53588.phpt trunk/ext/spl/tests/bug53588.phpt
aharvey Thu, 06 Jan 2011 02:24:49 + Revision: http://svn.php.net/viewvc?view=revision&revision=307146 Log: Remove empty files left when r306542 was reverted in r306552. Changed paths: D php/php-src/branches/PHP_5_3/ext/spl/tests/bug53588.phpt D php/php-src/trunk/ext/spl/tests/bug53588.phpt Deleted: php/php-src/branches/PHP_5_3/ext/spl/tests/bug53588.phpt === Deleted: php/php-src/trunk/ext/spl/tests/bug53588.phpt === -- 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/NEWS branches/PHP_5_3/ext/sqlite3/sqlite3.c trunk/ext/sqlite3/sqlite3.c
scottmac Thu, 06 Jan 2011 00:08:59 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307143
Log:
Implemented FR #53466 (SQLite3Result::columnType() should return false after
all of the rows have been fetched).
Bug: http://bugs.php.net/53466 (Open) sqlite3 columnType() returns SQLITE3_NULL
when not in fetch loop
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/sqlite3/sqlite3.c
U php/php-src/trunk/ext/sqlite3/sqlite3.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-01-05 21:20:08 UTC (rev 307142)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-01-06 00:08:59 UTC (rev 307143)
@@ -85,6 +85,7 @@
- SQLite3 extension:
. Fixed memory leaked introduced by the NULL poisoning patch (Mateusz
Kocielski, Pierre)
. Add SQlite3_Stmt::readonly() for checking if a statement is read only.
(Scott)
+ . Implemented FR #53466 (SQLite3Result::columnType() should return false
after all of the rows have been fetched). (Scott)
- Streams:
. Implemented FR #26158 (open arbitrary file descriptor with fopen).
(Gustavo)
Modified: php/php-src/branches/PHP_5_3/ext/sqlite3/sqlite3.c
===
--- php/php-src/branches/PHP_5_3/ext/sqlite3/sqlite3.c 2011-01-05 21:20:08 UTC
(rev 307142)
+++ php/php-src/branches/PHP_5_3/ext/sqlite3/sqlite3.c 2011-01-06 00:08:59 UTC
(rev 307143)
@@ -1585,6 +1585,10 @@
return;
}
+ if (result_obj->complete) {
+ RETURN_FALSE;
+ }
+
RETURN_LONG(sqlite3_column_type(result_obj->stmt_obj->stmt, column));
}
/* }}} */
@@ -1634,6 +1638,7 @@
break;
case SQLITE_DONE:
+ result_obj->complete = 1;
RETURN_FALSE;
break;
Modified: php/php-src/trunk/ext/sqlite3/sqlite3.c
===
--- php/php-src/trunk/ext/sqlite3/sqlite3.c 2011-01-05 21:20:08 UTC (rev
307142)
+++ php/php-src/trunk/ext/sqlite3/sqlite3.c 2011-01-06 00:08:59 UTC (rev
307143)
@@ -1582,6 +1582,10 @@
return;
}
+ if (result_obj->complete) {
+ RETURN_FALSE;
+ }
+
RETURN_LONG(sqlite3_column_type(result_obj->stmt_obj->stmt, column));
}
/* }}} */
@@ -1631,6 +1635,7 @@
break;
case SQLITE_DONE:
+ result_obj->complete = 1;
RETURN_FALSE;
break;
--
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_5/ NEWS configure.in main/php_version.h
johannes Wed, 05 Jan 2011 16:35:33 + Revision: http://svn.php.net/viewvc?view=revision&revision=307133 Log: PHP 5.3.5 Changed paths: U php/php-src/branches/PHP_5_3_5/NEWS U php/php-src/branches/PHP_5_3_5/configure.in U php/php-src/branches/PHP_5_3_5/main/php_version.h Modified: php/php-src/branches/PHP_5_3_5/NEWS === --- php/php-src/branches/PHP_5_3_5/NEWS 2011-01-05 15:39:17 UTC (rev 307132) +++ php/php-src/branches/PHP_5_3_5/NEWS 2011-01-05 16:35:33 UTC (rev 307133) @@ -1,6 +1,6 @@ PHP NEWS ||| -?? ??? 2011, PHP 5.3.5 +06 Jan 2011, PHP 5.3.5 - Fixed Bug #53632 (infinite loop with x87 fpu). (Scott, Rasmus) 09 Dec 2010, PHP 5.3.4 Modified: php/php-src/branches/PHP_5_3_5/configure.in === --- php/php-src/branches/PHP_5_3_5/configure.in 2011-01-05 15:39:17 UTC (rev 307132) +++ php/php-src/branches/PHP_5_3_5/configure.in 2011-01-05 16:35:33 UTC (rev 307133) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=5 -PHP_EXTRA_VERSION="-dev" +PHP_EXTRA_VERSION="" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_3_5/main/php_version.h === --- php/php-src/branches/PHP_5_3_5/main/php_version.h 2011-01-05 15:39:17 UTC (rev 307132) +++ php/php-src/branches/PHP_5_3_5/main/php_version.h 2011-01-05 16:35:33 UTC (rev 307133) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.3.5-dev" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.3.5" #define PHP_VERSION_ID 50305 -- 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_5/ ext/date/tests/big_year.phpt
johannes Wed, 05 Jan 2011 15:39:17 + Revision: http://svn.php.net/viewvc?view=revision&revision=307132 Log: - Merge r307123 Added test for big year (iliaa) Changed paths: _U php/php-src/branches/PHP_5_3_5/ A + php/php-src/branches/PHP_5_3_5/ext/date/tests/big_year.phpt (from php/php-src/branches/PHP_5_3/ext/date/tests/big_year.phpt:r307123) _U php/php-src/branches/PHP_5_3_5/ext/tidy/tests/ Property changes on: php/php-src/branches/PHP_5_3_5 ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:307095,307097 /php/php-src/trunk:284726,305015,305018-305019 + /php/php-src/branches/PHP_5_3:307095,307097,307103,307123 /php/php-src/trunk:284726,305015,305018-305019 Copied: php/php-src/branches/PHP_5_3_5/ext/date/tests/big_year.phpt (from rev 307123, php/php-src/branches/PHP_5_3/ext/date/tests/big_year.phpt) === --- php/php-src/branches/PHP_5_3_5/ext/date/tests/big_year.phpt (rev 0) +++ php/php-src/branches/PHP_5_3_5/ext/date/tests/big_year.phpt 2011-01-05 15:39:17 UTC (rev 307132) @@ -0,0 +1,17 @@ +--TEST-- +Handling of large year values +--SKIPIF-- + +--FILE-- + +--EXPECT-- +string(36) "Fri, 01 Jan 219250468 00:00:00 -0500" +OK Property changes on: php/php-src/branches/PHP_5_3_5/ext/tidy/tests ___ Modified: svn:mergeinfo - /php/php-src/trunk/ext/tidy/tests:284726,287798-287941,305015,305018-305019 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:307123 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941,305015,305018-305019 -- 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_5/ext/date/lib/ unixtime2tm.c
johannes Wed, 05 Jan 2011 15:34:34 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307131
Log:
- Merge r307103
Optimize unix timestamp to date-string conversion for very high year values
(iliaaa)
Changed paths:
U php/php-src/branches/PHP_5_3_5/ext/date/lib/unixtime2tm.c
Modified: php/php-src/branches/PHP_5_3_5/ext/date/lib/unixtime2tm.c
===
--- php/php-src/branches/PHP_5_3_5/ext/date/lib/unixtime2tm.c 2011-01-05
15:06:50 UTC (rev 307130)
+++ php/php-src/branches/PHP_5_3_5/ext/date/lib/unixtime2tm.c 2011-01-05
15:34:34 UTC (rev 307131)
@@ -55,6 +55,12 @@
if (ts >= 0) {
tmp_days = days + 1;
+
+ if (tmp_days >= DAYS_PER_LYEAR_PERIOD || tmp_days <=
-DAYS_PER_LYEAR_PERIOD) {
+ cur_year += YEARS_PER_LYEAR_PERIOD * (tmp_days /
DAYS_PER_LYEAR_PERIOD);
+ tmp_days -= DAYS_PER_LYEAR_PERIOD * (tmp_days /
DAYS_PER_LYEAR_PERIOD);
+ }
+
while (tmp_days >= DAYS_PER_LYEAR) {
cur_year++;
if (timelib_is_leap(cur_year)) {
--
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/spl/spl_observer.c branches/PHP_5_3/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt branches/PHP_5_3/ext/spl/tests/SplObjectStorage_removeAl
colder Wed, 05 Jan 2011 15:01:18 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307129
Log:
Implement SplObjectStorage::removeAllExcept (Patch by Matthey Turland)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/spl/spl_observer.c
A
php/php-src/branches/PHP_5_3/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt
A
php/php-src/branches/PHP_5_3/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
U php/php-src/trunk/ext/spl/spl_observer.c
A
php/php-src/trunk/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt
A
php/php-src/trunk/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_observer.c
===
--- php/php-src/branches/PHP_5_3/ext/spl/spl_observer.c 2011-01-05 14:57:13 UTC (rev 307128)
+++ php/php-src/branches/PHP_5_3/ext/spl/spl_observer.c 2011-01-05 15:01:18 UTC (rev 307129)
@@ -485,6 +485,36 @@
RETURN_LONG(zend_hash_num_elements(&intern->storage));
} /* }}} */
+/* {{{ proto bool SplObjectStorage::removeAllExcept(SplObjectStorage $os)
+ Remove elements not common to both this SplObjectStorage instance and $os */
+SPL_METHOD(SplObjectStorage, removeAllExcept)
+{
+ zval *obj;
+ spl_SplObjectStorage *intern = (spl_SplObjectStorage *)zend_object_store_get_object(getThis() TSRMLS_CC);
+ spl_SplObjectStorage *other;
+ spl_SplObjectStorageElement *element;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &obj, spl_ce_SplObjectStorage) == FAILURE) {
+ return;
+ }
+
+ other = (spl_SplObjectStorage *)zend_object_store_get_object(obj TSRMLS_CC);
+
+ zend_hash_internal_pointer_reset(&intern->storage);
+ while (zend_hash_get_current_data(&intern->storage, (void **)&element) == SUCCESS) {
+ if (!spl_object_storage_contains(other, element->obj TSRMLS_CC)) {
+ spl_object_storage_detach(intern, element->obj TSRMLS_CC);
+ }
+ zend_hash_move_forward(&intern->storage);
+ }
+
+ zend_hash_internal_pointer_reset_ex(&intern->storage, &intern->pos);
+ intern->index = 0;
+
+ RETURN_LONG(zend_hash_num_elements(&intern->storage));
+}
+/* }}} */
+
/* {{{ proto bool SplObjectStorage::contains($obj)
Determine whethe an object is contained in the storage */
SPL_METHOD(SplObjectStorage, contains)
@@ -827,6 +857,7 @@
SPL_ME(SplObjectStorage, contains,arginfo_Object,0)
SPL_ME(SplObjectStorage, addAll, arginfo_Object,0)
SPL_ME(SplObjectStorage, removeAll, arginfo_Object,0)
+ SPL_ME(SplObjectStorage, removeAllExcept, arginfo_Object,0)
SPL_ME(SplObjectStorage, getInfo, arginfo_splobject_void,0)
SPL_ME(SplObjectStorage, setInfo, arginfo_setInfo, 0)
/* Countable */
Added: php/php-src/branches/PHP_5_3/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt
===
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt 2011-01-05 15:01:18 UTC (rev 307129)
@@ -0,0 +1,27 @@
+--TEST--
+Check that SplObjectStorage::removeUncommon functions when receiving proper input
+--CREDITS--
+Matthew Turland (m...@matthewturland.com)
+--FILE--
+attach($a);
+$foo->attach($b);
+
+$bar = new SplObjectStorage;
+$bar->attach($b);
+$bar->attach($c);
+
+$foo->removeAllExcept($bar);
+var_dump($foo->contains($a));
+var_dump($foo->contains($b));
+
+?>
+--EXPECT--
+bool(false)
+bool(true)
Added: php/php-src/branches/PHP_5_3/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
===
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt 2011-01-05 15:01:18 UTC (rev 307129)
@@ -0,0 +1,44 @@
+--TEST--
+Check that SplObjectStorage::removeAllExcept generate a warning and returns NULL when passed non-object param
+--CREDITS--
+Matthew Turland (m...@matthewturland.com)
+Based on work done at PHPNW Testfest 2009 by Simon Westcott (swestc...@gmail.com)
+--FILE--
+removeAllExcept($input));
+}
+
+?>
+--EXPECTF--
+Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, array given in %s on line %d
+NULL
+
+Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, boolean given in %s on line %d
+NULL
+
+Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, %unicode_string_optional% given in %s on line %d
+NULL
+
+Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, integer given in %s on line %d
+NULL
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS configure.in main/php_version.h
iliaaWed, 05 Jan 2011 14:50:13 + Revision: http://svn.php.net/viewvc?view=revision&revision=307127 Log: Back to dev Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2011-01-05 14:49:26 UTC (rev 307126) +++ php/php-src/branches/PHP_5_2/NEWS 2011-01-05 14:50:13 UTC (rev 307127) @@ -1,5 +1,7 @@ PHP NEWS ||| +?? ??? , PHP 5.2.18 + 06 Jan 2010, PHP 5.2.17 - Fixed Bug #53632 (infinite loop with x87 fpu). (Scott, Rasmus) Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2011-01-05 14:49:26 UTC (rev 307126) +++ php/php-src/branches/PHP_5_2/configure.in 2011-01-05 14:50:13 UTC (rev 307127) @@ -41,8 +41,8 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 -PHP_RELEASE_VERSION=17 -PHP_EXTRA_VERSION="" +PHP_RELEASE_VERSION=18 +PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2011-01-05 14:49:26 UTC (rev 307126) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2011-01-05 14:50:13 UTC (rev 307127) @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 -#define PHP_RELEASE_VERSION 17 -#define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.2.17" -#define PHP_VERSION_ID 50217 +#define PHP_RELEASE_VERSION 18 +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.2.18-dev" +#define PHP_VERSION_ID 50218 -- 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 configure.in main/php_version.h
iliaaWed, 05 Jan 2011 14:48:13 + Revision: http://svn.php.net/viewvc?view=revision&revision=307125 Log: 5.2.17 Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2011-01-05 14:47:27 UTC (rev 307124) +++ php/php-src/branches/PHP_5_2/NEWS 2011-01-05 14:48:13 UTC (rev 307125) @@ -1,6 +1,7 @@ PHP NEWS ||| -?? ??? , PHP 5.2.17 +06 Jan 2010, PHP 5.2.17 +- Fixed Bug #53632 (infinite loop with x87 fpu). (Scott, Rasmus) 16 Dec 2010, PHP 5.2.16 - Fixed bug #53517 (segfault in pgsql_stmt_execute() when postgres is down). Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2011-01-05 14:47:27 UTC (rev 307124) +++ php/php-src/branches/PHP_5_2/configure.in 2011-01-05 14:48:13 UTC (rev 307125) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=17 -PHP_EXTRA_VERSION="-dev" +PHP_EXTRA_VERSION="" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2011-01-05 14:47:27 UTC (rev 307124) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2011-01-05 14:48:13 UTC (rev 307125) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 17 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.2.16-dev" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.2.17" #define PHP_VERSION_ID 50217 -- 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/ext/date/ lib/unixtime2tm.c tests/big_year.phpt
iliaaWed, 05 Jan 2011 14:47:27 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307124
Log:
MFH: Optimize unix timestamp to date-string conversion for very high year values
Changed paths:
U php/php-src/branches/PHP_5_2/ext/date/lib/unixtime2tm.c
A php/php-src/branches/PHP_5_2/ext/date/tests/big_year.phpt
Modified: php/php-src/branches/PHP_5_2/ext/date/lib/unixtime2tm.c
===
--- php/php-src/branches/PHP_5_2/ext/date/lib/unixtime2tm.c 2011-01-05
14:41:50 UTC (rev 307123)
+++ php/php-src/branches/PHP_5_2/ext/date/lib/unixtime2tm.c 2011-01-05
14:47:27 UTC (rev 307124)
@@ -55,6 +55,12 @@
if (ts >= 0) {
tmp_days = days + 1;
+
+ if (tmp_days >= DAYS_PER_LYEAR_PERIOD || tmp_days <=
-DAYS_PER_LYEAR_PERIOD) {
+ cur_year += YEARS_PER_LYEAR_PERIOD * (tmp_days /
DAYS_PER_LYEAR_PERIOD);
+ tmp_days -= DAYS_PER_LYEAR_PERIOD * (tmp_days /
DAYS_PER_LYEAR_PERIOD);
+ }
+
while (tmp_days >= DAYS_PER_LYEAR) {
cur_year++;
if (timelib_is_leap(cur_year)) {
Added: php/php-src/branches/PHP_5_2/ext/date/tests/big_year.phpt
===
--- php/php-src/branches/PHP_5_2/ext/date/tests/big_year.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_2/ext/date/tests/big_year.phpt 2011-01-05
14:47:27 UTC (rev 307124)
@@ -0,0 +1,17 @@
+--TEST--
+Handling of large year values
+--SKIPIF--
+
+--FILE--
+
+--EXPECT--
+string(36) "Fri, 01 Jan 219250468 00:00:00 -0500"
+OK
--
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/tests/big_year.phpt trunk/ext/date/tests/big_year.phpt
iliaaWed, 05 Jan 2011 14:41:50 + Revision: http://svn.php.net/viewvc?view=revision&revision=307123 Log: Added test Changed paths: A php/php-src/branches/PHP_5_3/ext/date/tests/big_year.phpt A php/php-src/trunk/ext/date/tests/big_year.phpt Added: php/php-src/branches/PHP_5_3/ext/date/tests/big_year.phpt === --- php/php-src/branches/PHP_5_3/ext/date/tests/big_year.phpt (rev 0) +++ php/php-src/branches/PHP_5_3/ext/date/tests/big_year.phpt 2011-01-05 14:41:50 UTC (rev 307123) @@ -0,0 +1,17 @@ +--TEST-- +Handling of large year values +--SKIPIF-- + +--FILE-- + +--EXPECT-- +string(36) "Fri, 01 Jan 219250468 00:00:00 -0500" +OK Added: php/php-src/trunk/ext/date/tests/big_year.phpt === --- php/php-src/trunk/ext/date/tests/big_year.phpt (rev 0) +++ php/php-src/trunk/ext/date/tests/big_year.phpt 2011-01-05 14:41:50 UTC (rev 307123) @@ -0,0 +1,17 @@ +--TEST-- +Handling of large year values +--SKIPIF-- + +--FILE-- + +--EXPECT-- +string(36) "Fri, 01 Jan 219250468 00:00:00 -0500" +OK -- 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/ NEWS configure.in main/php_version.h
johannes Wed, 05 Jan 2011 13:39:30 + Revision: http://svn.php.net/viewvc?view=revision&revision=307121 Log: - This will be PHP 5.3.6 Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/configure.in U php/php-src/branches/PHP_5_3/main/php_version.h Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2011-01-05 13:35:24 UTC (rev 307120) +++ php/php-src/branches/PHP_5_3/NEWS 2011-01-05 13:39:30 UTC (rev 307121) @@ -1,6 +1,6 @@ PHP NEWS ||| -?? ??? 2011, PHP 5.3.5 +?? ??? 2011, PHP 5.3.6 - Upgraded bundled Sqlite3 to version 3.7.4. (Ilia) - Upgraded bundled PCRE to version 8.11. (Ilia) @@ -8,7 +8,6 @@ . Indirect reference to $this fails to resolve if direct $this is never used in method. (Scott) . Fixed Bug #53629 (memory leak inside highlight_string()). (Hannes, Ilia) - . Fixed Bug #53632 (infinite loop with x87 fpu). (Scott, Rasmus) - Core: . Fixed bug #48484 (array_product() always returns 0 for an empty array). @@ -101,6 +100,9 @@ . Fixed bug #53603 (ZipArchive should quiet stat errors). (brad dot froehle at gmail dot com, Gustavo) +?? ??? 2011, PHP 5.3.5 +- Fixed Bug #53632 (infinite loop with x87 fpu). (Scott, Rasmus) + 09 Dec 2010, PHP 5.3.4 - Upgraded bundled Sqlite3 to version 3.7.3. (Ilia) - Upgraded bundled PCRE to version 8.10. (Ilia) Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2011-01-05 13:35:24 UTC (rev 307120) +++ php/php-src/branches/PHP_5_3/configure.in 2011-01-05 13:39:30 UTC (rev 307121) @@ -41,7 +41,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 -PHP_RELEASE_VERSION=5 +PHP_RELEASE_VERSION=6 PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_3/main/php_version.h === --- php/php-src/branches/PHP_5_3/main/php_version.h 2011-01-05 13:35:24 UTC (rev 307120) +++ php/php-src/branches/PHP_5_3/main/php_version.h 2011-01-05 13:39:30 UTC (rev 307121) @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 -#define PHP_RELEASE_VERSION 5 +#define PHP_RELEASE_VERSION 6 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.3.5-dev" -#define PHP_VERSION_ID 50305 +#define PHP_VERSION "5.3.6-dev" +#define PHP_VERSION_ID 50306 -- 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_5/ Zend/tests/bug53632.phpt
johannes Wed, 05 Jan 2011 13:35:24 + Revision: http://svn.php.net/viewvc?view=revision&revision=307120 Log: Merge rev. 307097 Add test for bug #53632 (scottmac) Bug: http://bugs.php.net/53632 (Closed) PHP hangs on numeric value 2.2250738585072011e-308 Changed paths: _U php/php-src/branches/PHP_5_3_5/ A + php/php-src/branches/PHP_5_3_5/Zend/tests/bug53632.phpt (from php/php-src/branches/PHP_5_3/Zend/tests/bug53632.phpt:r307097) Property changes on: php/php-src/branches/PHP_5_3_5 ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:307095 /php/php-src/trunk:284726,305015,305018-305019 + /php/php-src/branches/PHP_5_3:307095,307097 /php/php-src/trunk:284726,305015,305018-305019 Copied: php/php-src/branches/PHP_5_3_5/Zend/tests/bug53632.phpt (from rev 307097, php/php-src/branches/PHP_5_3/Zend/tests/bug53632.phpt) === --- php/php-src/branches/PHP_5_3_5/Zend/tests/bug53632.phpt (rev 0) +++ php/php-src/branches/PHP_5_3_5/Zend/tests/bug53632.phpt 2011-01-05 13:35:24 UTC (rev 307120) @@ -0,0 +1,10 @@ +--TEST-- +zend_strtod() hangs with 2.2250738585072011e-308 +--FILE-- + +--EXPECTF-- +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_3_5/ NEWS Zend/zend_strtod.c
johannes Wed, 05 Jan 2011 13:32:26 + Revision: http://svn.php.net/viewvc?view=revision&revision=307119 Log: Merge rev. 307095 - Fix bug #53632 with x87 fpu (scottmac) Bug: http://bugs.php.net/53632 (Closed) PHP hangs on numeric value 2.2250738585072011e-308 Changed paths: _U php/php-src/branches/PHP_5_3_5/ U php/php-src/branches/PHP_5_3_5/NEWS U php/php-src/branches/PHP_5_3_5/Zend/zend_strtod.c Property changes on: php/php-src/branches/PHP_5_3_5 ___ Modified: svn:mergeinfo - /php/php-src/trunk:284726,305015,305018-305019 + /php/php-src/branches/PHP_5_3:307095 /php/php-src/trunk:284726,305015,305018-305019 Modified: php/php-src/branches/PHP_5_3_5/NEWS === --- php/php-src/branches/PHP_5_3_5/NEWS 2011-01-05 13:26:25 UTC (rev 307118) +++ php/php-src/branches/PHP_5_3_5/NEWS 2011-01-05 13:32:26 UTC (rev 307119) @@ -1,5 +1,8 @@ PHP NEWS ||| +?? ??? 2011, PHP 5.3.5 +- Fixed Bug #53632 (infinite loop with x87 fpu). (Scott, Rasmus) + 09 Dec 2010, PHP 5.3.4 - Upgraded bundled Sqlite3 to version 3.7.3. (Ilia) - Upgraded bundled PCRE to version 8.10. (Ilia) Modified: php/php-src/branches/PHP_5_3_5/Zend/zend_strtod.c === --- php/php-src/branches/PHP_5_3_5/Zend/zend_strtod.c 2011-01-05 13:26:25 UTC (rev 307118) +++ php/php-src/branches/PHP_5_3_5/Zend/zend_strtod.c 2011-01-05 13:32:26 UTC (rev 307119) @@ -2035,7 +2035,7 @@ int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign, e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign; CONST char *s, *s0, *s1; - double aadj, aadj1, adj; + volatile double aadj, aadj1, adj; volatile _double rv, rv0; Long L; ULong y, z; -- 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_5/ configure.in main/php_version.h
johannes Wed, 05 Jan 2011 13:20:13 + Revision: http://svn.php.net/viewvc?view=revision&revision=307117 Log: - Go to -dev Changed paths: U php/php-src/branches/PHP_5_3_5/configure.in U php/php-src/branches/PHP_5_3_5/main/php_version.h Modified: php/php-src/branches/PHP_5_3_5/configure.in === --- php/php-src/branches/PHP_5_3_5/configure.in 2011-01-05 13:11:22 UTC (rev 307116) +++ php/php-src/branches/PHP_5_3_5/configure.in 2011-01-05 13:20:13 UTC (rev 307117) @@ -41,8 +41,8 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 -PHP_RELEASE_VERSION=4 -PHP_EXTRA_VERSION="" +PHP_RELEASE_VERSION=5 +PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_3_5/main/php_version.h === --- php/php-src/branches/PHP_5_3_5/main/php_version.h 2011-01-05 13:11:22 UTC (rev 307116) +++ php/php-src/branches/PHP_5_3_5/main/php_version.h 2011-01-05 13:20:13 UTC (rev 307117) @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 -#define PHP_RELEASE_VERSION 4 -#define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.3.4" -#define PHP_VERSION_ID 50304 +#define PHP_RELEASE_VERSION 5 +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.3.5-dev" +#define PHP_VERSION_ID 50305 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
