Xinchen Hui
896c4539df
Fixed bug #61605 (header_remove() does not remove all headers)
2012-04-04 16:01:43 +08:00
Xinchen Hui
bd400829af
Merge branch 'PHP-5.3' into PHP-5.4
2012-04-04 15:24:08 +08:00
Xinchen Hui
7b04638c8c
Fix test
...
cherry-pick from php-5.4
2012-04-04 15:20:28 +08:00
Ilia Alshanetsky
9c5ae9954f
Fixed bug #61423 (gzip compression fails).
2012-04-03 08:47:00 -04:00
Anatoliy Belsky
827c446b62
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61460 popen_close_error-win32 expected output is wrong
Conflicts:
ext/standard/tests/file/popen_pclose_error-win32.phpt
2012-04-03 14:22:59 +02:00
Matt Ficken
438536e45e
Fix bug #61460 popen_close_error-win32 expected output is wrong
2012-04-03 14:19:43 +02:00
Anatoliy Belsky
2a8866ba5e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails
2012-04-03 13:24:31 +02:00
Anatoliy Belsky
14e74aeb57
Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails
2012-04-03 13:23:06 +02:00
Anatoliy Belsky
b67a4cc340
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192
2012-04-03 13:09:17 +02:00
Anatoliy Belsky
94cefaedaf
Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192
2012-04-03 13:07:51 +02:00
Anatoliy Belsky
9c81654378
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt
2012-04-03 11:08:02 +02:00
Anatoliy Belsky
469cd3abf1
Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt
2012-04-03 11:04:52 +02:00
Xinchen Hui
e7a36ad902
Merge branch 'PHP-5.3' into PHP-5.4
2012-04-03 12:18:42 +08:00
Xinchen Hui
6d97e28e42
Update NEWS for #61541
2012-04-03 12:13:59 +08:00
Moriyoshi Koizumi
43047598c4
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
NEWS
2012-04-03 02:00:23 +09:00
Moriyoshi Koizumi
a6c95c8a00
Reset LIBS temporarily to make sure PHP_CHECK_FUNC will look into libc.
...
See Gentoo bug #364139 . https://bugs.gentoo.org/show_bug.cgi?id=364139
Reported by Naohiro Aota.
2012-04-03 01:51:23 +09:00
Anatoliy Belsky
374646c36b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
updated the libmagic.patch
Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails
- update to openssl 0.9.8u
Conflicts:
ext/fileinfo/tests/finfo_open_001.phpt
ext/fileinfo/tests/finfo_open_error.phpt
win32/build/libs_version.txt
2012-04-02 17:36:50 +02:00
Anatoliy Belsky
8684fb7fac
updated the libmagic.patch
2012-04-02 17:27:23 +02:00
Anatoliy Belsky
909713e233
Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
...
This patch fixes the failure caused by the
posix lseek and read versions under windows in cdf_read() .
Additionally all the occurences of lseek and read
was replaced by _lseek and _reed for windows.
2012-04-02 17:22:46 +02:00
Anatoliy Belsky
0cdba53aae
Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails
2012-04-02 17:19:09 +02:00
Pierre Joye
69e0e03457
- update to openssl 0.9.8u
2012-04-02 13:09:19 +02:00
Pierre Joye
55a6f3a12d
- update to openssl 0.9.8u
2012-04-02 13:07:59 +02:00
Derick Rethans
6c6bec5760
Merge branch 'PHP-5.3' into PHP-5.4
2012-04-02 10:40:02 +01:00
Derick Rethans
0e53ac49e6
- Updated to version 2012.3 (2012c)
2012-04-02 10:40:01 +01:00
Popa Adrian Marius
4ad9323fa2
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
2012-04-02 10:03:25 +03:00
Popa Adrian Marius
09b303425a
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2012-04-02 10:03:18 +03:00
Popa Adrian Marius
66b3b44fd5
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
2012-04-02 10:02:45 +03:00
David Soria Parra
3bf53aa911
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Cleanup Safe Mode related comment in SG(request_info)
2012-03-31 09:34:25 +02:00
reeze
ff8be9845f
Cleanup Safe Mode related comment in SG(request_info)
2012-03-31 09:34:08 +02:00
Christopher Jones
aa774a51d5
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Add php.ini parameter checks for OCI8
2012-03-30 16:17:37 -07:00
Christopher Jones
132d7113ea
Merge branch 'add-oci8-ini-tests' into PHP-5.3
...
* add-oci8-ini-tests:
Add php.ini parameter checks for OCI8
2012-03-30 16:16:32 -07:00
Christopher Jones
c56cfbd234
Add php.ini parameter checks for OCI8
...
Add tests for OCI8 php.ini parameters particularly to check
which parameters can be changes with ini_set().
2012-03-30 16:12:25 -07:00
Christopher Jones
4e8cab94d3
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
trivial change try to ci a "fake" merge
Fix test, parameter signatures was introduced only into 5.4
fix makedist for new tags
2012-03-30 10:48:45 -07:00
Xinchen Hui
14fdb8bf0a
trivial change try to ci a "fake" merge
...
seems now a empty merge will not be accepted by pre-receive-hook
"remote: We cannot figure out what you comitted!"
2012-03-30 20:50:45 +08:00
Xinchen Hui
e2edc820e0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix test, parameter signatures was introduced only into 5.4
2012-03-30 20:45:09 +08:00
Xinchen Hui
6b4112c98a
Fix test, parameter signatures was introduced only into 5.4
2012-03-30 20:37:48 +08:00
Stanislav Malyshev
82f166fa73
fix makedist for new tags
2012-03-30 00:01:52 -07:00
Christopher Jones
06235747b1
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Fixed bug61115-1.phpt for debug build version.
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
This will be PHP 5.3.12
ext/pcntl/pcntl.c: Fix typo in comment
Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
ext/pcntl/pcntl.c: Fix typo in comment
ext/pcntl/pcntl.c: Fix typo in comment
- fix bug #61541 , Segfault when using ob_* in output_callback
- fix bug #61541 , Segfault when using ob_* in output_callback
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
2012-03-29 17:42:40 -07:00
Popa Adrian Marius
5d8a0fd7ec
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
2012-03-29 18:28:22 +03:00
Popa Adrian Marius
97f4fc22c5
Fix firebird bug #60947 , tested and now it prints the header page information from database
2012-03-29 18:28:01 +03:00
Shein Alexey
c02aa086c6
Resolved conflict.
2012-03-29 17:03:43 +05:00
Shein Alexey
c0f806a69c
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.
2012-03-29 17:01:40 +05:00
Shein Alexey
e1352b0416
Fixed bug61115-1.phpt for debug build version.
2012-03-29 16:51:45 +05:00
Yasuo Ohgaki
8449e0ca89
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
2012-03-29 20:04:15 +09:00
Yasuo Ohgaki
aecf5485e3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
2012-03-29 19:55:06 +09:00
Yasuo Ohgaki
931831bf75
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
2012-03-29 19:48:58 +09:00
Johannes Schlüter
1d8664b90b
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
2012-03-29 11:43:26 +02:00
Johannes Schlüter
fb124764de
This will be PHP 5.3.12
2012-03-29 11:22:44 +02:00
Johannes Schlüter
0bca6214c6
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
2012-03-29 10:57:57 +02:00
Johannes Schlüter
21fa9634c1
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
2012-03-29 10:54:08 +02:00