]>
granicus.if.org Git - php/log
Dmitri Iouchtchenko [Sun, 29 Jul 2012 17:41:40 +0000 (13:41 -0400)]
Fix #61642: modify("+5 weekdays") returns Sunday
Adding a non-zero multiple of 5 weekdays to any Friday, Saturday, or
Sunday would result in a Sunday instead of the correct date. This patch
provides an implementation of do_adjust_special_weekday() which does
not suffer from this issue.
Xinchen Hui [Sun, 5 Aug 2012 04:47:28 +0000 (12:47 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Sun, 5 Aug 2012 04:46:55 +0000 (12:46 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sun, 5 Aug 2012 04:40:59 +0000 (12:40 +0800)]
Fix 126 tests failed of phar when --enable-zend-multibyte
Xinchen Hui [Sat, 4 Aug 2012 03:29:56 +0000 (11:29 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Sat, 4 Aug 2012 03:29:04 +0000 (11:29 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sat, 4 Aug 2012 03:14:03 +0000 (11:14 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
Zend/zend_API.h
Xinchen Hui [Sat, 4 Aug 2012 03:03:21 +0000 (11:03 +0800)]
This becomes useless, since we have set that in the INIT macro
Xinchen Hui [Sat, 4 Aug 2012 02:41:26 +0000 (10:41 +0800)]
Fixed bug #62744 (dangling pointers made by zend_disable_class)
the test will be added while commit the fix for #62737
Xinchen Hui [Thu, 2 Aug 2012 15:05:09 +0000 (23:05 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Thu, 2 Aug 2012 15:03:38 +0000 (23:03 +0800)]
Fixed bug #62725 (Calling exit() in a shutdown function does not return the exit value)
The fix is make 5.4 behavior consistent with 5.3
Xinchen Hui [Thu, 2 Aug 2012 14:29:43 +0000 (22:29 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Thu, 2 Aug 2012 14:28:04 +0000 (22:28 +0800)]
Fixed bug that can not get default value of parameter if it's not `optional`
Xinchen Hui [Thu, 2 Aug 2012 14:26:31 +0000 (22:26 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 2 Aug 2012 14:16:46 +0000 (22:16 +0800)]
Fixed bug that can not get default value of parameter if it's not `optional`
Xinchen Hui [Thu, 2 Aug 2012 11:33:58 +0000 (19:33 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Thu, 2 Aug 2012 11:33:27 +0000 (19:33 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 2 Aug 2012 11:31:34 +0000 (19:31 +0800)]
Fix test, wrong exepct rule used
Xinchen Hui [Thu, 2 Aug 2012 11:24:23 +0000 (19:24 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Thu, 2 Aug 2012 11:23:19 +0000 (19:23 +0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Xinchen Hui [Thu, 2 Aug 2012 11:23:04 +0000 (19:23 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
ext/standard/tests/file/realpath_cache.phpt
Xinchen Hui [Thu, 2 Aug 2012 11:14:06 +0000 (19:14 +0800)]
fix test due to float value
Nuno Lopes [Thu, 2 Aug 2012 10:44:15 +0000 (11:44 +0100)]
make default_exception_ce and error_exception_ce static
Nuno Lopes [Thu, 2 Aug 2012 10:44:15 +0000 (11:44 +0100)]
make default_exception_ce and error_exception_ce static
Xinchen Hui [Thu, 2 Aug 2012 04:55:43 +0000 (12:55 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Thu, 2 Aug 2012 04:55:05 +0000 (12:55 +0800)]
Fixed bug #62685 (Wrong return datatype in PDO::inTransaction())
Xinchen Hui [Thu, 2 Aug 2012 04:53:57 +0000 (12:53 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 2 Aug 2012 04:52:11 +0000 (12:52 +0800)]
Fixed bug #62685 (Wrong return datatype in PDO::inTransaction())
Xinchen Hui [Thu, 2 Aug 2012 04:34:15 +0000 (12:34 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Thu, 2 Aug 2012 04:32:44 +0000 (12:32 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 2 Aug 2012 04:30:07 +0000 (12:30 +0800)]
Fixed bug #62716 (munmap() is called with the incorrect length)
Stanislav Malyshev [Wed, 1 Aug 2012 19:21:49 +0000 (12:21 -0700)]
Merge branch 'PHP-5.4'
* PHP-5.4:
fix NEWS
Stanislav Malyshev [Wed, 1 Aug 2012 19:21:35 +0000 (12:21 -0700)]
fix NEWS
Xinchen Hui [Wed, 1 Aug 2012 15:56:44 +0000 (23:56 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Wed, 1 Aug 2012 15:54:01 +0000 (23:54 +0800)]
Sleep a little bit more, in some slow machine (like gcov), it will take a little more time to setup server
Xinchen Hui [Wed, 1 Aug 2012 12:26:02 +0000 (20:26 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Wed, 1 Aug 2012 12:24:53 +0000 (20:24 +0800)]
update NEWS
Xinchen Hui [Wed, 1 Aug 2012 12:24:14 +0000 (20:24 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 1 Aug 2012 12:23:30 +0000 (20:23 +0800)]
Fixed bug #62715 (ReflectionParameter::isDefaultValueAvailable() wrong result)
Stanislav Malyshev [Wed, 1 Aug 2012 04:52:03 +0000 (21:52 -0700)]
Merge branch 'PHP-5.4'
* PHP-5.4:
sync NEWS
Stanislav Malyshev [Wed, 1 Aug 2012 04:51:46 +0000 (21:51 -0700)]
sync NEWS
Stanislav Malyshev [Wed, 1 Aug 2012 04:45:32 +0000 (21:45 -0700)]
Merge branch 'PHP-5.4'
* PHP-5.4:
skip tests if ibase not present
Stanislav Malyshev [Mon, 30 Jul 2012 07:23:53 +0000 (00:23 -0700)]
skip tests if ibase not present
Xinchen Hui [Tue, 31 Jul 2012 14:43:10 +0000 (22:43 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Tue, 31 Jul 2012 14:42:28 +0000 (22:42 +0800)]
Implemented FR #62700 (have the console output 'Listening on http://localhost:8000')
Xinchen Hui [Tue, 31 Jul 2012 02:52:26 +0000 (10:52 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Tue, 31 Jul 2012 02:51:18 +0000 (10:51 +0800)]
expect pass for 5.4
Xinchen Hui [Tue, 31 Jul 2012 02:51:04 +0000 (10:51 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 31 Jul 2012 02:49:13 +0000 (10:49 +0800)]
Test for bug #62680
andrey [Mon, 30 Jul 2012 18:50:13 +0000 (21:50 +0300)]
Fix crashes with filenames that don't contain directory separator - generated
files like scanners/parsers.
Gustavo André dos Santos Lopes [Mon, 30 Jul 2012 09:04:48 +0000 (11:04 +0200)]
Merge branch '5.4'
* 5.4:
Fix test title and limit it to ICU >= 4.8
Remove executable bit from files
Limit test to ICU 49
Remove executable bit from files
Gustavo André dos Santos Lopes [Mon, 30 Jul 2012 09:04:10 +0000 (11:04 +0200)]
Fix test title and limit it to ICU >= 4.8
Gustavo André dos Santos Lopes [Mon, 30 Jul 2012 08:32:27 +0000 (10:32 +0200)]
Remove executable bit from files
Gustavo André dos Santos Lopes [Mon, 30 Jul 2012 08:31:10 +0000 (10:31 +0200)]
Merge branch '5.3' into 5.4
* 5.3:
Limit test to ICU 49
Remove executable bit from files
Gustavo André dos Santos Lopes [Mon, 30 Jul 2012 08:27:41 +0000 (10:27 +0200)]
Limit test to ICU 49
Gustavo André dos Santos Lopes [Mon, 30 Jul 2012 08:25:17 +0000 (10:25 +0200)]
Remove executable bit from files
Xinchen Hui [Sun, 29 Jul 2012 15:35:06 +0000 (23:35 +0800)]
Fix test failed due to new feature introduced in
45d596ea
Xinchen Hui [Sun, 29 Jul 2012 06:31:22 +0000 (14:31 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Sun, 29 Jul 2012 06:31:04 +0000 (14:31 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sun, 29 Jul 2012 06:30:01 +0000 (14:30 +0800)]
Sike test while there is no zend mm max_size guard
Xinchen Hui [Sun, 29 Jul 2012 05:26:29 +0000 (13:26 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Sun, 29 Jul 2012 05:26:05 +0000 (13:26 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Skip test while zend mm is disabled
Xinchen Hui [Sun, 29 Jul 2012 05:25:31 +0000 (13:25 +0800)]
Skip test while zend mm is disabled
Xinchen Hui [Sun, 29 Jul 2012 04:20:05 +0000 (12:20 +0800)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Skip test while zend_mm is disabled
Xinchen Hui [Sun, 29 Jul 2012 04:19:28 +0000 (12:19 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Skip test while zend_mm is disabled
Xinchen Hui [Sun, 29 Jul 2012 04:18:07 +0000 (12:18 +0800)]
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
Xinchen Hui [Sun, 29 Jul 2012 04:17:43 +0000 (12:17 +0800)]
Skip test while zend_mm is disabled
Felipe Pena [Sat, 28 Jul 2012 22:05:53 +0000 (19:05 -0300)]
Merge branch 'PHP-5.4'
* PHP-5.4:
- Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu
Felipe Pena [Sat, 28 Jul 2012 22:05:46 +0000 (19:05 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu
Felipe Pena [Sat, 28 Jul 2012 22:05:13 +0000 (19:05 -0300)]
- Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu
Xinchen Hui [Sat, 28 Jul 2012 09:01:50 +0000 (17:01 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Sat, 28 Jul 2012 09:01:29 +0000 (17:01 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sat, 28 Jul 2012 09:00:05 +0000 (17:00 +0800)]
Fixed bug #60194 for eavl
same reason here
Xinchen Hui [Fri, 27 Jul 2012 16:55:02 +0000 (00:55 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Fri, 27 Jul 2012 16:54:17 +0000 (00:54 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Fri, 27 Jul 2012 16:50:45 +0000 (00:50 +0800)]
Fixed bug #60194 (--with-zend-multibyte and --enable-debug reports LEAK with run-test.php)
It's not a big deal, just because lexer will read the char after cursor before leaving
Gustavo André dos Santos Lopes [Thu, 26 Jul 2012 21:37:02 +0000 (23:37 +0200)]
Fix bug #62651: source level BC break
Break for C++ extensions that don't wrap the includes of PHP libraries
in extern "C" {.
Pierrick Charron [Thu, 26 Jul 2012 23:13:42 +0000 (19:13 -0400)]
Fixed bug #62615 (test ext/curl/tests/curl_escape.phpt failed).
curl_easy_escape was modified in 5.21.2 to not escape "unreserved" characters
so this test will fail on version older than 5.21.2
Gustavo André dos Santos Lopes [Thu, 26 Jul 2012 21:37:02 +0000 (23:37 +0200)]
Fix bug #62651: source level BC break
Break for C++ extensions that don't wrap the includes of PHP libraries
in extern "C" {.
Stanislav Malyshev [Wed, 25 Jul 2012 00:44:45 +0000 (17:44 -0700)]
update 5.4.5 date
Xinchen Hui [Thu, 26 Jul 2012 05:58:01 +0000 (13:58 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Thu, 26 Jul 2012 05:57:04 +0000 (13:57 +0800)]
Fix test, committed in wrong folder
Xinchen Hui [Thu, 26 Jul 2012 05:52:42 +0000 (13:52 +0800)]
Fixed bug #62653: (unset($array[$float]) causes a crash)
the reason why jpauli and I can not reproduce is (it's silly):
I typo "USE_ZEND_ALLOC *&&* valgrind" at the first time, then I always ctrl+r
and jpauli copied my command from the pastbin :)
thanks
Xinchen Hui [Thu, 26 Jul 2012 04:44:51 +0000 (12:44 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Thu, 26 Jul 2012 04:42:33 +0000 (12:42 +0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Xinchen Hui [Thu, 26 Jul 2012 04:40:47 +0000 (12:40 +0800)]
Fixed bug #62661 (Interactive php-cli crashes if include() is used in auto_prepend_file)
Xinchen Hui [Wed, 25 Jul 2012 16:29:39 +0000 (00:29 +0800)]
Fixed invalid read in CONST_STRING dereference, reported by Nikic
Rasmus Lerdorf [Tue, 24 Jul 2012 23:28:49 +0000 (16:28 -0700)]
Fix bug #62654
Rasmus Lerdorf [Tue, 24 Jul 2012 23:28:49 +0000 (16:28 -0700)]
Fix bug #62654
Rasmus Lerdorf [Tue, 24 Jul 2012 23:28:49 +0000 (16:28 -0700)]
Fix bug #62654
Gustavo André dos Santos Lopes [Tue, 24 Jul 2012 13:13:02 +0000 (15:13 +0200)]
ini intl.explicit_cleanup -> INTL_EXPLICIT_CLEANUP
Added an environment variable and removed the ini setting
intl.explicit_cleanup for calling u_cleanup()
Felipe Pena [Tue, 24 Jul 2012 13:02:43 +0000 (10:02 -0300)]
Merge branch 'PHP-5.4'
* PHP-5.4:
- Fixed ZTS build
Updated NES
Felipe Pena [Tue, 24 Jul 2012 13:02:32 +0000 (10:02 -0300)]
- Fixed ZTS build
Florian Anderiasch [Tue, 24 Jul 2012 12:46:19 +0000 (14:46 +0200)]
Updated NES
Florian Anderiasch [Tue, 24 Jul 2012 12:34:41 +0000 (14:34 +0200)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Add syslog support to mail.log #62356
Florian Anderiasch [Tue, 24 Jul 2012 12:29:25 +0000 (14:29 +0200)]
Add syslog support to mail.log #62356
Patch by Michael Orlitzky
Florian Anderiasch [Tue, 24 Jul 2012 11:15:16 +0000 (13:15 +0200)]
Add optional depth parameter to json_encode #62369
Xinchen Hui [Tue, 24 Jul 2012 06:46:25 +0000 (14:46 +0800)]
Merge branch 'PHP-5.4'
Xinchen Hui [Tue, 24 Jul 2012 06:45:13 +0000 (14:45 +0800)]
binary compatibility
Xinchen Hui [Tue, 24 Jul 2012 06:43:53 +0000 (14:43 +0800)]
Re-fix bug #55544