]>
granicus.if.org Git - php/log
Pierre Joye [Wed, 28 Mar 2012 00:15:02 +0000 (02:15 +0200)]
Merge branch 'PHP-5.4'
* PHP-5.4:
- fix bug #61504, fix build errors on windows and possibly other
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Pierre Joye [Wed, 28 Mar 2012 00:11:06 +0000 (02:11 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- fix bug #61504, fix build errors on windows and possibly other
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Pierre Joye [Tue, 27 Mar 2012 23:59:41 +0000 (01:59 +0200)]
- fix bug #61504, fix build errors on windows and possibly other
Christopher Jones [Tue, 27 Mar 2012 18:57:55 +0000 (11:57 -0700)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Update README
Conflicts:
ext/oci8/README
Christopher Jones [Tue, 27 Mar 2012 18:54:05 +0000 (11:54 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Update README
Christopher Jones [Tue, 27 Mar 2012 18:52:23 +0000 (11:52 -0700)]
Merge branch 'readme1' into PHP-5.3
* readme1:
Update README
Christopher Jones [Tue, 27 Mar 2012 18:19:33 +0000 (11:19 -0700)]
Update README
More updates to OCI8 README as an excuse to try the PHP multi-dir git
workflow instructions.
Anatoliy Belsky [Tue, 27 Mar 2012 17:18:54 +0000 (19:18 +0200)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Fix bug #61518 skip on windows, fix on linux - ext/standard/tests/streams/bug60106.phpt
Anatoliy Belsky [Tue, 27 Mar 2012 16:53:50 +0000 (18:53 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug #61518 skip on windows, fix on linux - ext/standard/tests/streams/bug60106.phpt
Anatoliy Belsky [Tue, 27 Mar 2012 16:49:59 +0000 (18:49 +0200)]
Fix bug #61518 skip on windows, fix on linux - ext/standard/tests/streams/bug60106.phpt
Anatoliy Belsky [Tue, 27 Mar 2012 16:22:37 +0000 (18:22 +0200)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Fix bug #61519 test fails, should pass - ext/zlib/tests/bug60761.phpt
Anatoliy Belsky [Tue, 27 Mar 2012 16:16:02 +0000 (18:16 +0200)]
Merge branch '5.3' into 5.4
* 5.3:
Fix bug #61519 test fails, should pass - ext/zlib/tests/bug60761.phpt
Conflicts:
ext/zlib/tests/bug60761.phpt
Anatoliy Belsky [Tue, 27 Mar 2012 16:02:31 +0000 (18:02 +0200)]
Fix bug #61519 test fails, should pass - ext/zlib/tests/bug60761.phpt
Anatoliy Belsky [Tue, 27 Mar 2012 14:32:14 +0000 (16:32 +0200)]
Merge branch '5.4'
* 5.4:
Fix bug #61405 ext\openssl\tests\022.phpt fails
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
Anatoliy Belsky [Tue, 27 Mar 2012 14:15:15 +0000 (16:15 +0200)]
Merge branch '5.3' into 5.4
* 5.3:
Fix bug #61405 ext\openssl\tests\022.phpt fails
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
Anatoliy Belsky [Tue, 27 Mar 2012 14:05:05 +0000 (16:05 +0200)]
Fix bug #61405 ext\openssl\tests\022.phpt fails
Anatoliy Belsky [Tue, 27 Mar 2012 13:23:01 +0000 (15:23 +0200)]
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
Anatoliy Belsky [Tue, 27 Mar 2012 13:23:01 +0000 (15:23 +0200)]
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
Shein Alexey [Tue, 27 Mar 2012 14:02:01 +0000 (19:02 +0500)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Added failing test for ArrayObject::offsetExists().
Shein Alexey [Tue, 27 Mar 2012 14:00:28 +0000 (19:00 +0500)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Added failing test for ArrayObject::offsetExists().
Shein Alexey [Tue, 27 Mar 2012 14:00:05 +0000 (19:00 +0500)]
Merge branch 'failed-arrayaccess-test' into PHP-5.3
* failed-arrayaccess-test:
Added failing test for ArrayObject::offsetExists().
Shein Alexey [Tue, 27 Mar 2012 08:15:20 +0000 (13:15 +0500)]
Added failing test for ArrayObject::offsetExists().
Anatoliy Belsky [Tue, 27 Mar 2012 13:34:57 +0000 (15:34 +0200)]
Merge branch '5.4'
* 5.4:
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
Anatoliy Belsky [Tue, 27 Mar 2012 13:27:20 +0000 (15:27 +0200)]
Merge branch '5.3' into 5.4
* 5.3:
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
Anatoliy Belsky [Tue, 27 Mar 2012 13:23:01 +0000 (15:23 +0200)]
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
Pierre Joye [Tue, 27 Mar 2012 12:02:35 +0000 (14:02 +0200)]
Merge branch 'PHP-5.4'
* PHP-5.4:
- fix test for 5.11
Fix bug #61504, potential vuln. in fileinfo. update to 5.11
Pierre Joye [Tue, 27 Mar 2012 12:02:07 +0000 (14:02 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- fix test for 5.11
Fix bug #61504, potential vuln. in fileinfo. update to 5.11
Pierre Joye [Tue, 27 Mar 2012 12:01:38 +0000 (14:01 +0200)]
- fix test for 5.11
Pierre Joye [Tue, 27 Mar 2012 11:34:46 +0000 (13:34 +0200)]
Fix bug #61504, potential vuln. in fileinfo. update to 5.11
Yasuo Ohgaki [Mon, 26 Mar 2012 15:34:21 +0000 (00:34 +0900)]
Adjust mbstring php.ini settings
Yasuo Ohgaki [Mon, 26 Mar 2012 15:30:31 +0000 (00:30 +0900)]
Merge branch 'pull-request/22'
* pull-request/22:
mbstring use UTF-8
slumbers99 [Sun, 25 Mar 2012 13:12:39 +0000 (22:12 +0900)]
mbstring use UTF-8
Stanislav Malyshev [Sun, 25 Mar 2012 20:54:27 +0000 (13:54 -0700)]
Merge branch 'PHP-5.4'
* PHP-5.4:
fix test
Stanislav Malyshev [Sun, 25 Mar 2012 20:53:49 +0000 (13:53 -0700)]
fix test
Stanislav Malyshev [Sun, 25 Mar 2012 20:50:33 +0000 (13:50 -0700)]
Merge branch 'PHP-5.4'
* PHP-5.4:
fix tests
Stanislav Malyshev [Sun, 25 Mar 2012 20:49:19 +0000 (13:49 -0700)]
fix tests
Stanislav Malyshev [Sun, 25 Mar 2012 08:03:43 +0000 (01:03 -0700)]
Merge branch 'PHP-5.4'
* PHP-5.4:
fix bug #61487 - bad bounds check in grapheme_strpos
Stanislav Malyshev [Sun, 25 Mar 2012 08:03:25 +0000 (01:03 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix bug #61487 - bad bounds check in grapheme_strpos
Stanislav Malyshev [Sun, 25 Mar 2012 08:03:02 +0000 (01:03 -0700)]
Merge branch 'grapheme_fix' into PHP-5.3
* grapheme_fix:
fix bug #61487 - bad bounds check in grapheme_strpos
Stanislav Malyshev [Sun, 25 Mar 2012 08:00:37 +0000 (01:00 -0700)]
Merge branch 'PHP-5.4'
* PHP-5.4:
NEWS for bug #61487
NEWS for bug #61487
Stanislav Malyshev [Sun, 25 Mar 2012 08:00:06 +0000 (01:00 -0700)]
NEWS for bug #61487
Stanislav Malyshev [Sun, 25 Mar 2012 07:58:43 +0000 (00:58 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
NEWS for bug #61487
Stanislav Malyshev [Sun, 25 Mar 2012 07:57:08 +0000 (00:57 -0700)]
NEWS for bug #61487
Stanislav Malyshev [Fri, 23 Mar 2012 07:26:33 +0000 (00:26 -0700)]
fix bug #61487 - bad bounds check in grapheme_strpos
Pierrick Charron [Sat, 24 Mar 2012 22:00:04 +0000 (18:00 -0400)]
Merge branch 'PHP-5.4'
Pierrick Charron [Sat, 24 Mar 2012 21:59:46 +0000 (17:59 -0400)]
Merge branch 'PHP-5.3' into PHP-5.4
Pierrick Charron [Sat, 24 Mar 2012 21:49:58 +0000 (17:49 -0400)]
Remove unused variable
Hannes Magnusson [Sat, 24 Mar 2012 17:00:04 +0000 (18:00 +0100)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Fix test on FreeBSD and other systems that have /etc/services
Hannes Magnusson [Sat, 24 Mar 2012 16:59:52 +0000 (17:59 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix test on FreeBSD and other systems that have /etc/services
Hannes Magnusson [Sat, 24 Mar 2012 16:58:40 +0000 (17:58 +0100)]
Fix test on FreeBSD and other systems that have /etc/services
Hannes Magnusson [Sat, 24 Mar 2012 16:20:36 +0000 (17:20 +0100)]
Merge branch 'PHP-5.4'
* PHP-5.4:
This is a git checkout
Revert incorrect fix
Hannes Magnusson [Sat, 24 Mar 2012 16:20:14 +0000 (17:20 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
This is a git checkout
Revert incorrect fix
Hannes Magnusson [Sat, 24 Mar 2012 16:16:50 +0000 (17:16 +0100)]
This is a git checkout
Ilia Alshanetsky [Sat, 24 Mar 2012 16:27:55 +0000 (12:27 -0400)]
Revert incorrect fix
David Soria Parra [Sat, 24 Mar 2012 13:40:09 +0000 (14:40 +0100)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)"
David Soria Parra [Sat, 24 Mar 2012 13:39:03 +0000 (14:39 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)"
David Soria Parra [Sat, 24 Mar 2012 13:38:03 +0000 (14:38 +0100)]
Merge commit '
521ebec3e9bcd4fa75772d2bfa57a733dfe1d5fa ' into PHP-5.3
This merge combines a accidentaly separated head, leading to two duplicated
commits in history (again).
* commit '
521ebec3e9bcd4fa75772d2bfa57a733dfe1d5fa ':
Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)"
Xinchen Hui [Sat, 24 Mar 2012 11:41:11 +0000 (19:41 +0800)]
Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)
The previous commit was reverted as Stas ask, so only commit this
to Truk now.
Xinchen Hui [Sat, 24 Mar 2012 11:38:40 +0000 (19:38 +0800)]
Improve set_exception_handler while doing reset
Xinchen Hui [Sat, 24 Mar 2012 11:26:02 +0000 (19:26 +0800)]
Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)"
This reverts commit
fcae164ea63979d7814d7aa114fe8351033e7400 .
Xinchen Hui [Sat, 24 Mar 2012 11:28:43 +0000 (19:28 +0800)]
Merge branch 'PHP-5.4' of ../php-5.4
Xinchen Hui [Sat, 24 Mar 2012 11:27:00 +0000 (19:27 +0800)]
Revert "Update NEWS"
This reverts commit
88a8085aa3ae4ce3928d0309a3c5530e7483a134 .
Xinchen Hui [Sat, 24 Mar 2012 11:26:27 +0000 (19:26 +0800)]
Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
Xinchen Hui [Sat, 24 Mar 2012 11:26:02 +0000 (19:26 +0800)]
Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)"
This reverts commit
fcae164ea63979d7814d7aa114fe8351033e7400 .
Xinchen Hui [Sat, 24 Mar 2012 11:25:21 +0000 (19:25 +0800)]
Revert "Merge from PHP-5.4"
This reverts commit
9a87fe1c529eabc7aeec4559d916dda5fda3cdd2 .
Xinchen Hui [Sat, 24 Mar 2012 07:16:51 +0000 (15:16 +0800)]
Merge branch 'PHP-5.4' of ../php-5.4
Xinchen Hui [Sat, 24 Mar 2012 07:15:58 +0000 (15:15 +0800)]
Update NEWS
Xinchen Hui [Sat, 24 Mar 2012 07:15:27 +0000 (15:15 +0800)]
Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
Xinchen Hui [Sat, 24 Mar 2012 07:13:10 +0000 (15:13 +0800)]
Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)
Xinchen Hui [Sat, 24 Mar 2012 06:34:13 +0000 (14:34 +0800)]
Merge branch 'PHP-5.4' of ../php-5.4
Xinchen Hui [Sat, 24 Mar 2012 06:34:01 +0000 (14:34 +0800)]
Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
Xinchen Hui [Sat, 24 Mar 2012 06:33:00 +0000 (14:33 +0800)]
Merge from PHP-5.4
Improve set_exception_handler
Xinchen Hui [Sat, 24 Mar 2012 06:23:22 +0000 (14:23 +0800)]
Merge branch 'PHP-5.4' of ../php-5.4
Xinchen Hui [Sat, 24 Mar 2012 06:22:53 +0000 (14:22 +0800)]
Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
Xinchen Hui [Sat, 24 Mar 2012 06:22:04 +0000 (14:22 +0800)]
Fix ZTS build
Xinchen Hui [Sat, 24 Mar 2012 04:23:52 +0000 (12:23 +0800)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Typo
Xinchen Hui [Sat, 24 Mar 2012 04:23:41 +0000 (12:23 +0800)]
Typo
Xinchen Hui [Sat, 24 Mar 2012 04:15:17 +0000 (12:15 +0800)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Fix test
Xinchen Hui [Sat, 24 Mar 2012 04:15:04 +0000 (12:15 +0800)]
Fix test
Xinchen Hui [Sat, 24 Mar 2012 03:56:27 +0000 (11:56 +0800)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Improve set_exception_handler
Conflicts:
NEWS
Xinchen Hui [Sat, 24 Mar 2012 03:46:29 +0000 (11:46 +0800)]
Improve set_exception_handler
Remove useless alloc/free and return_value copy while doing reset
exception handler
Xinchen Hui [Sat, 24 Mar 2012 03:50:07 +0000 (11:50 +0800)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Improve set_exception_handler
Xinchen Hui [Sat, 24 Mar 2012 03:46:29 +0000 (11:46 +0800)]
Improve set_exception_handler
Remove useless alloc/free and return_value copy while doing reset
exception handler
Xinchen Hui [Sat, 24 Mar 2012 03:35:29 +0000 (11:35 +0800)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Remove empty lines
Xinchen Hui [Sat, 24 Mar 2012 03:35:13 +0000 (11:35 +0800)]
Remove empty lines
Gustavo André dos Santos Lopes [Fri, 23 Mar 2012 22:14:56 +0000 (22:14 +0000)]
Merge branch '5.4'
Gustavo André dos Santos Lopes [Fri, 23 Mar 2012 22:14:36 +0000 (22:14 +0000)]
Merge branch '5.3' into 5.4
Gustavo André dos Santos Lopes [Fri, 23 Mar 2012 22:14:24 +0000 (22:14 +0000)]
Merge branch 'dom_debug_handler' into 5.3
Gustavo André dos Santos Lopes [Fri, 23 Mar 2012 22:13:26 +0000 (22:13 +0000)]
Updated NEWS (DOM object debug info handler).
Gustavo André dos Santos Lopes [Fri, 23 Mar 2012 22:08:33 +0000 (22:08 +0000)]
Fixed tests that var_dump/print_r DOM objects.
Gustavo André dos Santos Lopes [Thu, 22 Mar 2012 21:49:04 +0000 (21:49 +0000)]
Improved on DOM object debug info handler. Added test.
Joey Smith [Tue, 20 Mar 2012 03:22:53 +0000 (21:22 -0600)]
Added DOM Debug handler
Gustavo André dos Santos Lopes [Fri, 23 Mar 2012 11:32:43 +0000 (11:32 +0000)]
Merge branch '5.4'
Gustavo André dos Santos Lopes [Fri, 23 Mar 2012 11:32:20 +0000 (11:32 +0000)]
Merge branch '5.3' into 5.4
Gustavo André dos Santos Lopes [Fri, 23 Mar 2012 09:42:05 +0000 (09:42 +0000)]
Fixed bug #61482, caused by the fix to bug #61418.
Turns out I'd forgotten to also update the destructor for the iterator
returned by DirectoryIterator.
The iterator for DirectoryIterator maintains the same ->current pointer
throughout its existence (the DirectoryIterator itself) and returns it
(the same object) everytime a value is requested from the iterator.
Moving forward the iterator only changes the object. Previous code
added two references to the object in get_iterator on the account of
1) the iterator memory living in its DirectoryIterator object and
2) the object being stored in iterator->current. This seems to be
unnecessary. Iterators are not responsible for incrementing the refcount
of the values they yield, that's up to the caller (the engine). What
matters for the iterator is that the object exists as long as the
iterator exists and this can be guaranteed by incremented the refcount
only once. Consequently, I only add one reference in get_iterator
(and reclaim it in the iterator destructor).
Gustavo André dos Santos Lopes [Fri, 23 Mar 2012 09:40:27 +0000 (09:40 +0000)]
Revert "Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482"
This reverts commit
a89c4a34ee55686ab1430a5060e1460335fc5203 .
Gustavo André dos Santos Lopes [Fri, 23 Mar 2012 09:40:20 +0000 (09:40 +0000)]
Revert "revert from NEWS too"
This reverts commit
4990250f2d5bd3dad82e9d98d4b18c3091bf8843 .
Stanislav Malyshev [Fri, 23 Mar 2012 05:34:32 +0000 (22:34 -0700)]
revert from NEWS too
Stanislav Malyshev [Fri, 23 Mar 2012 05:31:10 +0000 (22:31 -0700)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
update for git
Stanislav Malyshev [Fri, 23 Mar 2012 05:30:51 +0000 (22:30 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
Add initialization tests for SQLT_INT binds
Fix NEWS