]>
granicus.if.org Git - php/log
Popa Adrian Marius [Thu, 29 Mar 2012 15:28:38 +0000 (18:28 +0300)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Fix firebird bug #60947 , tested and now it prints the header page information from database
Popa Adrian Marius [Thu, 29 Mar 2012 15:28:22 +0000 (18:28 +0300)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix firebird bug #60947 , tested and now it prints the header page information from database
Popa Adrian Marius [Thu, 29 Mar 2012 15:28:01 +0000 (18:28 +0300)]
Fix firebird bug #60947 , tested and now it prints the header page information from database
Shein Alexey [Thu, 29 Mar 2012 12:25:49 +0000 (17:25 +0500)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed bug61115-1.phpt for debug build version.
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
Shein Alexey [Thu, 29 Mar 2012 12:03:43 +0000 (17:03 +0500)]
Resolved conflict.
Shein Alexey [Thu, 29 Mar 2012 12:01:40 +0000 (17:01 +0500)]
Merge branch 'fix-debug-build-bug61115-1.phpt' into PHP-5.3
* fix-debug-build-bug61115-1.phpt:
Fixed bug61115-1.phpt for debug build version.
Shein Alexey [Thu, 29 Mar 2012 11:51:45 +0000 (16:51 +0500)]
Fixed bug61115-1.phpt for debug build version.
Yasuo Ohgaki [Thu, 29 Mar 2012 11:06:00 +0000 (20:06 +0900)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
Yasuo Ohgaki [Thu, 29 Mar 2012 10:48:58 +0000 (19:48 +0900)]
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
Yasuo Ohgaki [Thu, 29 Mar 2012 10:55:06 +0000 (19:55 +0900)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
Yasuo Ohgaki [Thu, 29 Mar 2012 10:48:58 +0000 (19:48 +0900)]
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
Johannes Schlüter [Thu, 29 Mar 2012 09:44:10 +0000 (11:44 +0200)]
Merge branch 'PHP-5.4'
* PHP-5.4:
This will be PHP 5.3.12
Johannes Schlüter [Thu, 29 Mar 2012 09:43:26 +0000 (11:43 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
This will be PHP 5.3.12
Conflicts:
configure.in
main/php_version.h
Johannes Schlüter [Thu, 29 Mar 2012 09:22:44 +0000 (11:22 +0200)]
This will be PHP 5.3.12
Johannes Schlüter [Thu, 29 Mar 2012 08:59:02 +0000 (10:59 +0200)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Johannes Schlüter [Thu, 29 Mar 2012 08:57:57 +0000 (10:57 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Johannes Schlüter [Thu, 29 Mar 2012 08:54:08 +0000 (10:54 +0200)]
Merge remote branch 'security/PHP-5.3' into PHP-5.3
* security/PHP-5.3:
fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
open_basedir check for linkinfo
NEWS entry for readline fix
Add open_basedir checks to readline_write_history and readline_read_history
Gustavo André dos Santos Lopes [Thu, 29 Mar 2012 07:48:13 +0000 (08:48 +0100)]
Merge branch '5.4'
Gustavo André dos Santos Lopes [Thu, 29 Mar 2012 07:47:58 +0000 (08:47 +0100)]
Merge branch '5.3' into 5.4
Conflicts:
main/output.c
Gustavo André dos Santos Lopes [Thu, 29 Mar 2012 07:46:31 +0000 (08:46 +0100)]
Merge rebased pull request #24 onto 5.3 into 5.3
Jille Timmermans [Wed, 28 Mar 2012 14:18:23 +0000 (16:18 +0200)]
ext/pcntl/pcntl.c: Fix typo in comment
Signed-off-by: Jille Timmermans <jille@quis.cx>
Gustavo André dos Santos Lopes [Thu, 29 Mar 2012 07:45:00 +0000 (08:45 +0100)]
Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
This reverts commit
4aeabaf8e938af00d6fe9f8316251b543640018c.
Gustavo André dos Santos Lopes [Thu, 29 Mar 2012 07:44:19 +0000 (08:44 +0100)]
Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
This reverts commit
55b1e612421c52ea0bb8a3772095c5bbd62045db.
Gustavo André dos Santos Lopes [Thu, 29 Mar 2012 07:41:51 +0000 (08:41 +0100)]
Revert "Merge branch 'pull-request/24'" (apply correct workflow)
This reverts commit
a00b447b34c21efab393fef063acaae652506938, reversing
changes made to
48daddf093b491d359b77919464827ffb20a3e86.
Stanislav Malyshev [Thu, 29 Mar 2012 04:16:04 +0000 (21:16 -0700)]
Merge branch 'sec54' into PHP-5.4
* sec54:
update NEWS
fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
open_basedir check for linkinfo
NEWS entry for readline fix
NEWS entry for readline fix
Add open_basedir checks to readline_write_history and readline_read_history
Jille Timmermans [Wed, 28 Mar 2012 14:18:23 +0000 (16:18 +0200)]
ext/pcntl/pcntl.c: Fix typo in comment
Signed-off-by: Jille Timmermans <jille@quis.cx>
Jille Timmermans [Wed, 28 Mar 2012 14:18:23 +0000 (16:18 +0200)]
ext/pcntl/pcntl.c: Fix typo in comment
Signed-off-by: Jille Timmermans <jille@quis.cx>
Yasuo Ohgaki [Thu, 29 Mar 2012 00:06:04 +0000 (09:06 +0900)]
Merge branch 'pull-request/24'
* pull-request/24:
ext/pcntl/pcntl.c: Fix typo in comment
Yasuo Ohgaki [Wed, 28 Mar 2012 23:51:29 +0000 (08:51 +0900)]
Merge branch 'pull-request/25' into 5.3
* pull-request/25:
- fix bug #61541, Segfault when using ob_* in output_callback
reeze [Wed, 28 Mar 2012 16:18:02 +0000 (00:18 +0800)]
- fix bug #61541, Segfault when using ob_* in output_callback
Gustavo André dos Santos Lopes [Wed, 28 Mar 2012 20:43:02 +0000 (21:43 +0100)]
Merge branch '5.4'
Gustavo André dos Santos Lopes [Wed, 28 Mar 2012 20:42:48 +0000 (21:42 +0100)]
Merge branch '5.3' into 5.4
Gustavo André dos Santos Lopes [Wed, 28 Mar 2012 20:41:56 +0000 (21:41 +0100)]
Merge commit rebase pull request 16 into 5.3
Shein Alexey [Wed, 21 Mar 2012 21:59:02 +0000 (02:59 +0500)]
Refactoring junit logger. Added generation of nested testsuites in junit.xml.
Anatoliy Belsky [Wed, 28 Mar 2012 17:43:45 +0000 (19:43 +0200)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Fix bug #61459 popen_close_basic-win32 can't run sort.exe
Anatoliy Belsky [Wed, 28 Mar 2012 17:32:24 +0000 (19:32 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug #61459 popen_close_basic-win32 can't run sort.exe
Anatoliy Belsky [Wed, 28 Mar 2012 17:25:29 +0000 (19:25 +0200)]
Fix bug #61459 popen_close_basic-win32 can't run sort.exe
reeze [Wed, 28 Mar 2012 16:18:02 +0000 (00:18 +0800)]
- fix bug #61541, Segfault when using ob_* in output_callback
Anatoliy Belsky [Wed, 28 Mar 2012 15:25:23 +0000 (17:25 +0200)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Fix bug #61401 ext\openssl\tests\004.phpt fails
Fix bug #61404 ext\openssl\tests\021.phpt fails
Fix bug #61404 ext\openssl\tests\021.phpt fails
Fix bug #61448 intl tests fail with icu >= 4.8
Anatoliy Belsky [Wed, 28 Mar 2012 15:13:16 +0000 (17:13 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug #61401 ext\openssl\tests\004.phpt fails
Fix bug #61404 ext\openssl\tests\021.phpt fails
Fix bug #61448 intl tests fail with icu >= 4.8
Anatoliy Belsky [Wed, 28 Mar 2012 15:11:58 +0000 (17:11 +0200)]
Fix bug #61401 ext\openssl\tests\004.phpt fails
Anatoliy Belsky [Wed, 28 Mar 2012 14:04:56 +0000 (16:04 +0200)]
Fix bug #61404 ext\openssl\tests\021.phpt fails
Jille Timmermans [Wed, 28 Mar 2012 14:18:23 +0000 (16:18 +0200)]
ext/pcntl/pcntl.c: Fix typo in comment
Signed-off-by: Jille Timmermans <jille@quis.cx>
Anatoliy Belsky [Wed, 28 Mar 2012 14:04:56 +0000 (16:04 +0200)]
Fix bug #61404 ext\openssl\tests\021.phpt fails
Anatoliy Belsky [Wed, 28 Mar 2012 14:04:56 +0000 (16:04 +0200)]
Fix bug #61404 ext\openssl\tests\021.phpt fails
Anatoliy Belsky [Wed, 28 Mar 2012 11:59:51 +0000 (13:59 +0200)]
Fix bug #61448 intl tests fail with icu >= 4.8
Anatoliy Belsky [Wed, 28 Mar 2012 12:53:28 +0000 (14:53 +0200)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Fix bug #61448 intl tests fail with icu >= 4.8
Anatoliy Belsky [Wed, 28 Mar 2012 12:51:16 +0000 (14:51 +0200)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
Fixed problem introduced in
a763929 (fixing bug #61347).
Gustavo André dos Santos Lopes [Wed, 28 Mar 2012 12:13:52 +0000 (13:13 +0100)]
Merge remote branch 'origin/PHP-5.4' into 5.4
Gustavo André dos Santos Lopes [Wed, 28 Mar 2012 12:12:12 +0000 (13:12 +0100)]
Merge remote branch 'origin/PHP-5.3' into 5.3
Gustavo André dos Santos Lopes [Wed, 28 Mar 2012 12:06:49 +0000 (13:06 +0100)]
Merge branch 'master' of git.php.net:/php-src
Gustavo André dos Santos Lopes [Wed, 28 Mar 2012 12:06:36 +0000 (13:06 +0100)]
Merge branch '5.4'
Gustavo André dos Santos Lopes [Wed, 28 Mar 2012 12:06:05 +0000 (13:06 +0100)]
Merge branch '5.3' into 5.4
Gustavo André dos Santos Lopes [Wed, 28 Mar 2012 12:04:41 +0000 (13:04 +0100)]
Fixed problem introduced in
a763929 (fixing bug #61347).
The test added in
8c44c85 should now pass.
Anatoliy Belsky [Wed, 28 Mar 2012 12:01:14 +0000 (14:01 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug #61448 intl tests fail with icu >= 4.8
Anatoliy Belsky [Wed, 28 Mar 2012 11:59:51 +0000 (13:59 +0200)]
Fix bug #61448 intl tests fail with icu >= 4.8
Anatoliy Belsky [Wed, 28 Mar 2012 11:19:45 +0000 (13:19 +0200)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
Anatoliy Belsky [Wed, 28 Mar 2012 10:56:17 +0000 (12:56 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
Anatoliy Belsky [Wed, 28 Mar 2012 10:54:19 +0000 (12:54 +0200)]
Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
Anatoliy Belsky [Wed, 28 Mar 2012 10:11:29 +0000 (12:11 +0200)]
Merge branch 'PHP-5.4'
* PHP-5.4:
Bug 61504 updated libmagic.patch
Bug #61504 TSRML_FETCH() must be last
Anatoliy Belsky [Wed, 28 Mar 2012 10:10:25 +0000 (12:10 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Bug 61504 updated libmagic.patch
Bug #61504 TSRML_FETCH() must be last
Anatoliy Belsky [Wed, 28 Mar 2012 10:06:09 +0000 (12:06 +0200)]
Bug 61504 updated libmagic.patch
Anatoliy Belsky [Wed, 28 Mar 2012 10:05:20 +0000 (12:05 +0200)]
Bug #61504 TSRML_FETCH() must be last
Gustavo André dos Santos Lopes [Wed, 28 Mar 2012 07:58:09 +0000 (08:58 +0100)]
Merge branch '5.4'
Gustavo André dos Santos Lopes [Wed, 28 Mar 2012 07:44:05 +0000 (08:44 +0100)]
Merge branch '5.3' into 5.4
Zend/zend_language_scanner.c and Zend/zend_language_scanner_defs.h had to be changed manually.
Gustavo André dos Santos Lopes [Wed, 28 Mar 2012 07:43:41 +0000 (08:43 +0100)]
Restored the good part of
74ee335 that was just reverted.
Gustavo André dos Santos Lopes [Wed, 28 Mar 2012 07:41:18 +0000 (08:41 +0100)]
Revert "- fix bug #61504, fix build errors on windows and possibly other"
This reverts commit
74ee335e3aea8c48380334098b8d20eb54d6c6be.
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
projects / php / log