1
0
mirror of https://github.com/php/php-src.git synced 2026-04-27 01:48:26 +02:00
Commit Graph

49151 Commits

Author SHA1 Message Date
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 55a6f3a12d - update to openssl 0.9.8u 2012-04-02 13:07:59 +02:00
Derick Rethans 0e53ac49e6 - Updated to version 2012.3 (2012c) 2012-04-02 10:40:01 +01: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
reeze ff8be9845f Cleanup Safe Mode related comment in SG(request_info) 2012-03-31 09:34:08 +02: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
Xinchen Hui 6b4112c98a Fix test, parameter signatures was introduced only into 5.4 2012-03-30 20:37:48 +08: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 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
Johannes Schlüter fb124764de This will be PHP 5.3.12 2012-03-29 11:22:44 +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
Gustavo André dos Santos Lopes 67bf07f3e7 Merge rebased pull request #24 onto 5.3 into 5.3 2012-03-29 08:46:37 +01:00
Jille Timmermans 710335b2a3 ext/pcntl/pcntl.c: Fix typo in comment
Signed-off-by: Jille Timmermans <jille@quis.cx>
2012-03-29 08:46:04 +01:00
Gustavo André dos Santos Lopes 117cdf384f Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
This reverts commit 55b1e61242.
2012-03-29 08:44:19 +01:00
Jille Timmermans 55b1e61242 ext/pcntl/pcntl.c: Fix typo in comment
Signed-off-by: Jille Timmermans <jille@quis.cx>
2012-03-29 09:07:07 +09:00
Yasuo Ohgaki f38ee78344 Merge branch 'pull-request/25' into 5.3
* pull-request/25:
  - fix bug #61541, Segfault when using ob_* in output_callback
2012-03-29 08:51:29 +09:00
reeze abd2b2ee43 - fix bug #61541, Segfault when using ob_* in output_callback 2012-03-29 06:23:05 +09:00
Gustavo André dos Santos Lopes 5ddfdb8fd4 Merge commit rebase pull request 16 into 5.3 2012-03-28 21:41:59 +01:00
Shein Alexey 1e88d0033f Refactoring junit logger. Added generation of nested testsuites in junit.xml. 2012-03-28 21:39:24 +01:00
Anatoliy Belsky eeab3be303 Fix bug #61459 popen_close_basic-win32 can't run sort.exe 2012-03-28 19:25:29 +02:00
reeze 9bc91a21db - fix bug #61541, Segfault when using ob_* in output_callback 2012-03-29 00:18:02 +08:00
Anatoliy Belsky bff8152565 Fix bug #61401 ext\openssl\tests\004.phpt fails 2012-03-28 17:11:58 +02:00
Anatoliy Belsky bd7bb973b1 Fix bug #61404 ext\openssl\tests\021.phpt fails 2012-03-28 16:04:56 +02:00
Anatoliy Belsky bd928f0592 Fix bug #61448 intl tests fail with icu >= 4.8 2012-03-28 15:07:01 +02:00
Gustavo André dos Santos Lopes 4fa0c2a963 Merge remote branch 'origin/PHP-5.3' into 5.3 2012-03-28 13:12:12 +01:00
Gustavo André dos Santos Lopes f07dd29fdc Fixed problem introduced in a763929 (fixing bug #61347).
The test added in 8c44c85 should now pass.
2012-03-28 13:04:41 +01:00
Anatoliy Belsky 0b20329aaf Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails 2012-03-28 12:54:19 +02:00
Anatoliy Belsky 11f04c3524 Bug 61504 updated libmagic.patch 2012-03-28 12:06:09 +02:00
Anatoliy Belsky e7fa402c7c Bug #61504 TSRML_FETCH() must be last 2012-03-28 12:05:20 +02:00
Gustavo André dos Santos Lopes 067603106e Restored the good part of 74ee335 that was just reverted. 2012-03-28 08:43:41 +01:00
Gustavo André dos Santos Lopes c6e15455a3 Revert "- fix bug #61504, fix build errors on windows and possibly other"
This reverts commit 74ee335e3a.
2012-03-28 08:41:18 +01:00
Pierre Joye 74ee335e3a - fix bug #61504, fix build errors on windows and possibly other 2012-03-28 01:59:41 +02:00
Christopher Jones c8ced8c0a3 Merge branch 'readme1' into PHP-5.3
* readme1:
  Update README
2012-03-27 11:52:23 -07:00
Christopher Jones 968a330220 Update README
More updates to OCI8 README as an excuse to try the PHP multi-dir git
workflow instructions.
2012-03-27 11:19:33 -07:00
Anatoliy Belsky da85d5b4a0 Fix bug #61518 skip on windows, fix on linux - ext/standard/tests/streams/bug60106.phpt 2012-03-27 18:49:59 +02:00
Anatoliy Belsky bcfcfb2fc5 Fix bug #61519 test fails, should pass - ext/zlib/tests/bug60761.phpt 2012-03-27 18:02:31 +02:00
Anatoliy Belsky b638d3020c Fix bug #61405 ext\openssl\tests\022.phpt fails 2012-03-27 16:07:59 +02:00
Anatoliy Belsky e55718b091 Fix bug #61412 ext\openssl\tests\bug28382.phpt fails 2012-03-27 16:07:59 +02:00
Shein Alexey 8c44c85b06 Merge branch 'failed-arrayaccess-test' into PHP-5.3
* failed-arrayaccess-test:
  Added failing test for ArrayObject::offsetExists().
2012-03-27 19:00:05 +05:00
Shein Alexey ddac4688e8 Added failing test for ArrayObject::offsetExists(). 2012-03-27 18:59:04 +05:00
Pierre Joye d0e3289d12 - fix test for 5.11 2012-03-27 14:01:38 +02:00
Pierre Joye 12cf930a40 Fix bug #61504, potential vuln. in fileinfo. update to 5.11 2012-03-27 13:34:46 +02:00
Stanislav Malyshev 167e2fd782 fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN 2012-03-25 12:50:25 -07:00
Stanislav Malyshev bc313f5e80 Merge branch 'grapheme_fix' into PHP-5.3
* grapheme_fix:
  fix bug #61487 - bad bounds check in grapheme_strpos
2012-03-25 01:03:02 -07:00
Stanislav Malyshev 4c478f9ca6 NEWS for bug #61487 2012-03-25 00:57:08 -07:00
Stanislav Malyshev cd9cd36d7e fix bug #61487 - bad bounds check in grapheme_strpos 2012-03-25 00:56:38 -07:00
Rasmus Lerdorf 900778731c open_basedir check for linkinfo 2012-03-25 05:32:21 +05:30