Commit Graph

68512 Commits

Author SHA1 Message Date
andrey
b42d000471 Fix for bug#61411
Bug #61411 PDO Segfaults with PERSISTENT == TRUE && EMULATE_PREPARES == FALSE
Wrong allocation, that doesn't follow the scheme of using stmt->persistent
was the root cause of the problem and the crash at free.
2012-05-02 15:55:22 +02:00
Stanislav Malyshev
e25eea8b83 merge 5.3.11 stuff 2012-05-02 00:08:04 -07:00
Stanislav Malyshev
b0e8be8aea organize NEWS 2012-05-02 00:00:59 -07:00
Stanislav Malyshev
7bbd5521d2 Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards information) and"
This reverts commit cb2a1c71c9.
The fix is not correct, not fixed after discussion on github.
Please fix the issues and reapply the patch
2012-05-01 23:54:10 -07:00
Christopher Jones
93192ec56d Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Make output order for dom007.phpt platform independent
2012-05-01 15:49:19 -07:00
Christopher Jones
72507d38fb Merge branch 'bug61810' into PHP-5.3
* bug61810:
  Make output order for dom007.phpt platform independent
2012-05-01 15:47:54 -07:00
Christopher Jones
d14f23365c Make output order for dom007.phpt platform independent
This test has long been near the top of the reported output diffs.
For example, on http://qa.php.net/reports/?version=5.4.0 it has diffed
1307 times out of 3543 reports, at time of this commit.  (The second
highest diff has occurred 710 times.)
2012-05-01 15:43:31 -07:00
Christopher Jones
cac09f3333 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix masking in bug61115-1.phpt
2012-05-01 14:34:54 -07:00
Christopher Jones
02e25df8b5 Merge branch 'fix-bug61115-1.phpt-for-no-debug' into PHP-5.3
* fix-bug61115-1.phpt-for-no-debug:
  Fix masking in bug61115-1.phpt
2012-05-01 14:33:57 -07:00
Christopher Jones
c864b1ca2f Fix masking in bug61115-1.phpt
The test bug61115-1.phpt was diffing for non-debug builds
2012-05-01 14:32:09 -07:00
Felipe Pena
4deb0f1a0a - Regenerated files 2012-04-30 15:57:00 -03:00
Felipe Pena
79961dccab - Fixed Windows build 2012-04-30 15:55:57 -03:00
Anatoliy Belsky
819a7ae6a1 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2012-04-30 17:25:25 +02:00
Anatoliy Belsky
47c8b6039a Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
2012-04-30 17:25:11 +02:00
Anatoliy Belsky
d26e006d7f Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails 2012-04-30 17:23:49 +02:00
Felipe Pena
1622843162 - Regenerated files 2012-04-30 10:35:28 -03:00
Felipe Pena
3120387617 - Changed last commit to use VK_ESCAPE on Windows 2012-04-30 10:31:49 -03:00
Anatoliy Belsky
fc24e74260 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Additional fixs for bug 61746 - prepare/clean acls
2012-04-30 14:36:42 +02:00
Anatoliy Belsky
ec5421d044 Additional fixs for bug 61746 - prepare/clean acls 2012-04-30 14:33:48 +02:00
Anatoliy Belsky
36836f147c Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61870 ext\session\tests\bug42596.phpt fails
2012-04-30 12:10:43 +02:00
Anatoliy Belsky
680685127f Fix bug 61870 ext\session\tests\bug42596.phpt fails 2012-04-30 12:06:28 +02:00
Anatoliy Belsky
455040c4ab Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug ext\filter\tests\bug52209.phpt fails
2012-04-30 10:28:00 +02:00
Anatoliy Belsky
8249581a2d Fix bug ext\filter\tests\bug52209.phpt fails 2012-04-30 10:25:54 +02:00
Xinchen Hui
72ccce4b8b Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4 2012-04-30 12:35:44 +08:00
Xinchen Hui
a601605f14 merge test from PHP-5.4 2012-04-30 12:33:55 +08:00
Xinchen Hui
d80a3d9668 Revert "Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3"
After pushed, I found the test script in 5.4 is already fixed this, so
revert this change, and be consistent with 5.4's test

This reverts commit 24d85e4bd8, reversing
changes made to bae56a87f8.
2012-04-30 12:31:33 +08:00
Xinchen Hui
24d85e4bd8 Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3 2012-04-30 12:29:15 +08:00
Xinchen Hui
fd518ffc7e Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4
* origin/PHP-5.3:
  Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi).
  - BFN

Conflicts:
	sapi/cli/php_cli.c
2012-04-30 12:15:43 +08:00
Xinchen Hui
bae56a87f8 Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi). 2012-04-30 12:09:22 +08:00
Felipe Pena
b336af29e1 - BFN 2012-04-29 19:48:00 -03:00
Felipe Pena
9aff3a1156 - BFN 2012-04-29 19:44:27 -03:00
Felipe Pena
cc5b995c78 - Fixed bug #61827 (incorrect \e processing on Windows) patch by: ab@php.net 2012-04-29 19:35:52 -03:00
Felipe Pena
6008f9af8f Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Added missing bound check in iptcparse() (path by chris at chiappa.net)
2012-04-29 19:14:03 -03:00
Felipe Pena
d44a383986 - Added missing bound check in iptcparse() (path by chris at chiappa.net) 2012-04-29 19:12:12 -03:00
reeze
e52be10b30 Fix test for proc_nice: bsd ps command didn't support option -o "%p %n" 2012-04-30 00:59:54 +08:00
Anatoliy Belsky
6f8fae606b Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()
2012-04-28 11:44:54 +02:00
Matt Ficken
dc6d283b1c Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime() 2012-04-28 11:42:42 +02:00
Anatoliy Belsky
3dbe48762f Fix bug 61786 Failing tests in ext\session\tests\* 2012-04-26 15:39:45 +02:00
Anatoliy Belsky
94d96f7782 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails

Conflicts:
	ext/sqlite3/tests/sqlite3_15_open_error.phpt
2012-04-26 15:17:46 +02:00
Anatoliy Belsky
4daab0abec Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails 2012-04-26 15:14:26 +02:00
Anatoliy Belsky
19df3c1b1c Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
2012-04-26 13:28:49 +02:00
Anatoliy Belsky
4e9db5ba9f Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails 2012-04-26 13:27:01 +02:00
Anatoliy Belsky
459e758f03 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Partial fix for bug 61743 to get correct icacls path
2012-04-25 18:46:22 +02:00
Anatoliy Belsky
433290e199 Partial fix for bug 61743 to get correct icacls path 2012-04-25 18:38:27 +02:00
Stanislav Malyshev
7d3d38abec sync version 2012-04-24 16:30:37 -07:00
Michael Wallner
ac4d53cf70 fix NEWS order 2012-04-24 21:22:19 +02:00
Michael Wallner
52cb8ed314 BFN 2012-04-24 20:40:19 +02:00
Michael Wallner
7c93a16477 fix bug #61443
Since upgrade to PHP 5.4, we can't change zlib.output_compression on the
fly

the check for PHP_OUTPUT_WRITTEN was over-zealous
2012-04-24 20:35:49 +02:00
Michael Wallner
df00b64cb9 fixed bug #61820
using ob_gzhandler will complain about headers already sent
when no compression

the Vary header should only be sent on the PHP_OUTPUT_HANDLER_START
event
2012-04-24 19:50:00 +02:00
Anatoliy Belsky
f21376d668 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 only
2012-04-24 14:08:26 +02:00