clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-27 21:07:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,388 Commits 494 Branches 1,367 Tags 783 MiB
376635cde8
Commit Graph

68388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
376635cde8 Merge branch 'PHP-5.3' into PHP-5.4 2012-05-06 20:32:15 +08:00
Xinchen Hui
99076bc24f Change the test folder 2012-05-06 20:31:40 +08:00
Xinchen Hui
4cceeb25b7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)
 2012-05-06 20:28:18 +08:00
Xinchen Hui
7ccd594392 Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference) 2012-05-06 20:01:10 +08:00
Nikita Popov
bef6111609 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
 2012-05-06 13:33:47 +02:00
Nikita Popov
304ac568c5 Add NEWS entry for bug #61961 2012-05-06 13:19:17 +02:00
Nikita Popov
311ee8f69c Merge branch 'pull-request/76' into PHP-5.3 2012-05-06 12:45:45 +02:00
Reeze Xia
3e9923dd8d Fixed Bug #61961 (file_get_content leaks when access empty file with max length) 2012-05-06 18:27:26 +08:00
Xinchen Hui
0747b29bdf Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  correct NEWS
  Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)

Conflicts:
	ext/curl/interface.c
 2012-05-06 00:52:51 +08:00
Xinchen Hui
4632fe0eef correct NEWS 2012-05-06 00:51:20 +08:00
Xinchen Hui
19632ae7dc Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) 2012-05-06 00:50:37 +08:00
Xinchen Hui
035ce937e1 Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) 2012-05-06 00:40:49 +08:00
David Soria Parra
948ab62c25 Merge branch 'PHP-5.3' into PHP-5.4 
By Rasmus Lerdorf
* PHP-5.3:
  Fix for CVE-2012-1823 (cherry picked from commit 29300b1f9d)
 2012-05-05 17:36:55 +02:00
Rasmus Lerdorf
168e8920be Fix for CVE-2012-1823 
(cherry picked from commit 29300b1f9d)
 2012-05-05 17:34:07 +02:00
Rasmus Lerdorf
0556103f6a Fix for CVE-2012-1823 2012-05-04 11:58:24 -07:00
Anatoliy Belsky
f5936cceeb Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
 2012-05-04 11:42:05 +02:00
Anatoliy Belsky
8a10259642 Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails 2012-05-04 11:40:49 +02:00
Anatoliy Belsky
16fdf86ea3 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
 2012-05-04 11:32:12 +02:00
Anatoliy Belsky
6c12252790 Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt 2012-05-04 11:29:49 +02:00
Christopher Jones
31ab04ee25 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Bump to next version

Conflicts:
	configure.in
	main/php_version.h
 2012-05-03 12:22:39 -07:00
Christopher Jones
0956c00af9 Bump to next version 
Bump PHP version number
 2012-05-03 12:03:49 -07:00
Xinchen Hui
72f19e9a8b Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config) 2012-05-03 22:39:53 +08:00
Xinchen Hui
d74d88fbb9 Fixed test bug #61892 2012-05-03 19:56:49 +08:00
Xinchen Hui
75d23f5714 Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4 
* origin/PHP-5.3:
  Fix typo
 2012-05-03 18:40:57 +08:00
Xinchen Hui
bbf8a50281 Fix typo 
picked form pull request of reeze.xia@gmail.com
 2012-05-03 18:39:03 +08:00
Anatoliy Belsky
cdce62b724 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
 2012-05-02 21:41:33 +02:00
Anatoliy Belsky
69ed09a31c Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis 
openssl needs explicit openssl.cnf on windows
 2012-05-02 21:38:32 +02:00
andrey
67419499b2 Merge branch 'PHP-5.3' into PHP-5.4 2012-05-02 15:57:08 +02:00
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