Anatoliy Belsky
36449bface
Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt
2012-04-03 13:28:37 +02:00
Xinchen Hui
7a2885a591
Merge branch 'PHP-5.4'
2012-04-03 12:19:05 +08: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
Klaus Silveira
16bd11062e
Small performance improvement. The current code is correct, but if it is used inside a long loop or long strings, it's inefficient.
2012-04-02 22:54:57 -03:00
Moriyoshi Koizumi
14f120dbd9
Merge branch 'PHP-5.4'
2012-04-03 02:00:34 +09: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
94d4bb86b4
Merge branch 'PHP-5.4'
...
* PHP-5.4:
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
- update to openssl 0.9.8u
2012-04-02 17:43:23 +02: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
Pierre Joye
45416cbe56
- update to openssl 0.9.8u
2012-04-02 13:06:44 +02:00
Derick Rethans
cecc37b467
Merge branch 'PHP-5.4'
2012-04-02 10:40:03 +01: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
Popa Adrian Marius
e3e7f47441
Merge branch 'master' of git.php.net:php-src
2012-04-02 09:57:48 +03:00
Gustavo André dos Santos Lopes
1c16c89b96
Merge branch 'intl_calendar'
2012-04-01 23:36:59 +01:00
Gustavo André dos Santos Lopes
0e8d928c07
Update UPGRADING with changes.
2012-04-01 23:35:29 +01:00
Gustavo André dos Santos Lopes
d32ac3efc8
Fixed tests that required a "default" timezone.
...
Added date.timezone=Atlantic/Azores to all tests that were failing because
of ext/date warning about a timezone not having been set.
2012-04-01 23:28:01 +01:00
Gustavo André dos Santos Lopes
95fbae891a
Compatibility with old versions of ICU (4.0+).
2012-04-01 23:28:01 +01:00
Gustavo André dos Santos Lopes
69f75bb43c
Added support for new method TimeZone::getUnknown() added in ICU 49.
2012-04-01 23:28:00 +01:00
Gustavo André dos Santos Lopes
d3a29c108b
Supported Calendar methods new to ICU 49.
2012-04-01 23:28:00 +01:00
Gustavo André dos Santos Lopes
7460741f99
Fix TimeZone tests failing due to new data in ICU 49.
2012-04-01 23:28:00 +01:00
Gustavo André dos Santos Lopes
5e65205a8f
Initial checkin of calendar/timezone code.
2012-04-01 23:28:00 +01:00
Gustavo André dos Santos Lopes
6c891f33d7
Put new function in correct section.
2012-04-01 23:27:50 +01:00
Gustavo André dos Santos Lopes
ab627e0eb0
Convert EOL style to Unix.
2012-04-01 11:00:05 +02:00
Ferenc Kovacs
15a98ece9f
Revert "making the test fail for testing jenkins report mail. I will revert this soon."
...
This reverts commit b8fe28f455
2012-03-31 11:23:26 +02:00
Ferenc Kovacs
b8fe28f455
making the test fail for testing jenkins report mail. I will revert this soon.
2012-03-31 11:22:16 +02:00
David Soria Parra
cae2556462
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Cleanup Safe Mode related comment in SG(request_info)
2012-03-31 09:34:43 +02: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
8b2a51c62c
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Add php.ini parameter checks for OCI8
2012-03-30 16:18:15 -07: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
15405e2abd
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' 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:49 -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
1904cf696b
Merge branch 'PHP-5.4'
...
* PHP-5.4:
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 20:57:55 +08: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
c3fd894d0a
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' 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)
Revert "Merge branch 'pull-request/24'" (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
ext/pcntl/pcntl.c: Fix typo in comment
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:43 -07:00
