clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,306 Commits 491 Branches 1,363 Tags 846 MiB
bc87ba8ee6
Commit Graph

79306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
bc87ba8ee6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  backport this piece from 5.6, related to the #66307 fix
  Fixed bug #66307 Fileinfo crashes with powerpoint files
  Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
  Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS
  fix my last commit with some locales
 2014-05-26 18:06:58 -07:00
Stanislav Malyshev
076c25bfec Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  backport this piece from 5.6, related to the #66307 fix
  Fixed bug #66307 Fileinfo crashes with powerpoint files
 2014-05-26 18:06:15 -07:00
Anatol Belski
d184f07b3c backport this piece from 5.6, related to the #66307 fix 2014-05-26 18:05:13 -07:00
Anatol Belski
15ee33eb21 Fixed bug #66307 Fileinfo crashes with powerpoint files 2014-05-26 18:04:27 -07:00
Stanislav Malyshev
5ce11c2698 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
  Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS
 2014-05-26 18:03:01 -07:00
Stanislav Malyshev
4005f06df6 Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation) 
Upstream patch: b8acc83781
 2014-05-26 18:01:17 -07:00
Stanislav Malyshev
57225f09ed Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS 
Upstream fix: f97486ef5d
 2014-05-26 17:45:14 -07:00
Nuno Lopes
21f579b338 fix my last commit with some locales 2014-05-26 15:09:10 -04:00
Nuno Lopes
f105e1589d fix my last commit with some locales 2014-05-26 15:08:00 -04:00
Xinchen Hui
b0b0be176f Merge branch 'PHP-5.5' into PHP-5.6 2014-05-26 15:40:50 +08:00
Xinchen Hui
70699d7f68 Update NEWs and add a test 2014-05-26 15:40:26 +08:00
Dmitry Stogov
24a86dbb6f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed issue #183 (TMP_VAR is not only used once)
 2014-05-26 10:12:10 +04:00
Dmitry Stogov
19be8b676c Fixed issue #183 (TMP_VAR is not only used once) 2014-05-26 10:10:59 +04:00
Matteo Beccati
370256ad4b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix broken Junit output with --disable-cgi
 2014-05-25 00:08:41 +02:00
Matteo Beccati
980c63651c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix broken Junit output with --disable-cgi
 2014-05-25 00:08:32 +02:00
Matteo Beccati
f9357b44f3 Fix broken Junit output with --disable-cgi 2014-05-25 00:07:52 +02:00
Xinchen Hui
666197b8cc Added folder mark 2014-05-24 21:11:13 +08:00
Matteo Beccati
4a773c0e58 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
  Fix run-tests.php with Valgrind >= 3.10.0.
  Add microseconds to the serialised form of DateTime objects.
 2014-05-24 08:06:53 +02:00
Adam Harvey
80a2716b56 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
 2014-05-23 15:23:15 +00:00
Adam Harvey
2260fca3dd Further test fixes for the fdb2709 breakage. 2014-05-23 15:22:26 +00:00
Adam Harvey
6d9cc92238 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix broken test caused by fdb2709.

Conflicts:
	ext/intl/tests/dateformat_format.phpt
 2014-05-23 15:14:00 +00:00
Adam Harvey
319611ffbd Fix broken test caused by fdb2709. 2014-05-23 15:07:19 +00:00
Adam Harvey
34900eb289 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix run-tests.php with Valgrind >= 3.10.0.
 2014-05-22 22:37:57 +00:00
Adam Harvey
e5e6ba093f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix run-tests.php with Valgrind >= 3.10.0.

Conflicts:
	run-tests.php
 2014-05-22 22:37:47 +00:00
Adam Harvey
5d1bfd6fbf Fix run-tests.php with Valgrind >= 3.10.0. 
The version test that we had in run-tests.php assumed that the major and minor
version numbers were always single digits. This removes that assumption and
also uses version_compare() for the comparison instead of naively converting it
to an integer.
 2014-05-22 22:37:08 +00:00
Adam Harvey
549331a925 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add microseconds to the serialised form of DateTime objects.
 2014-05-21 15:05:08 -05:00
Adam Harvey
d39377924c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add microseconds to the serialised form of DateTime objects.
 2014-05-21 15:03:24 -05:00
Adam Harvey
fdb2709dd2 Add microseconds to the serialised form of DateTime objects. 
Fixes bug #67308 (Serialize of DateTime truncates fractions of second).
 2014-05-21 14:55:52 -05:00
Matteo Beccati
b41ad9bfcb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Improved test for bug #62479
 2014-05-21 18:59:14 +02:00
Matteo Beccati
69d4a0b8d5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Improved test for bug #62479
 2014-05-21 18:59:02 +02:00
Matteo Beccati
00a22d4d06 Improved test for bug #62479 2014-05-21 18:58:14 +02:00
Stanislav Malyshev
7df1e42d8a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix typo in ODBC code
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  5.5.14 now
  Fix bug #67060: use default mode of 660

Conflicts:
	configure.in
	main/php_version.h
 2014-05-18 23:46:30 -07:00
Stanislav Malyshev
fc076ef605 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix typo in ODBC code
  Fix bug #67060: use default mode of 660
 2014-05-18 23:44:33 -07:00
Stanislav Malyshev
fa6aaf8c03 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix typo in ODBC code
  Fix bug #67060: use default mode of 660

Conflicts:
	ext/odbc/php_odbc.c
 2014-05-18 23:43:59 -07:00
Stanislav Malyshev
adc070ca99 fix typo in ODBC code 2014-05-18 23:42:30 -07:00
Dmitry Stogov
1d1fdfb51d Support for __debugInfo (Joe Watkins) 2014-05-18 20:55:40 +04:00
Dmitry Stogov
3fff53fc57 Optimize ZEND_POW (Rouven Weßling) 2014-05-18 20:48:16 +04:00
Nuno Lopes
5164b81324 gcov: tentative fix for broken coverage data after fix for opcache coverage 
slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
 2014-05-18 11:24:22 -04:00
Nuno Lopes
1759905a23 gcov: tentative fix for broken coverage data after fix for opcache coverage 
slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
 2014-05-18 11:23:21 -04:00
Tjerk Meesters
d4295eb26a Prevent recursion in ZF2 Parameters class 2014-05-16 16:49:47 +08:00
Julien Pauli
b4c92f31ad 5.5.14 now 2014-05-14 10:24:32 +02:00
Ferenc Kovacs
7b9c1b6576 adding NEWS block for beta4 2014-05-14 09:14:04 +02:00
Stanislav Malyshev
5a169310f0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.30 next
 2014-05-13 22:22:03 -07:00
Stanislav Malyshev
b17efe82ff Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.30 next

Conflicts:
	configure.in
	main/php_version.h
 2014-05-13 22:21:50 -07:00
Stanislav Malyshev
b1c944dfd2 5.4.30 next 2014-05-13 22:20:15 -07:00
Stanislav Malyshev
3a90a8b888 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  enable email notifications
 2014-05-13 17:14:56 -07:00
Stanislav Malyshev
6b6a58c904 enable email notifications 
[skip ci]
 2014-05-13 17:14:06 -07:00
Stanislav Malyshev
de20e2224b update NEWS 2014-05-13 17:09:16 -07:00
Stanislav Malyshev
7a14a460cf Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  update NEWS
 2014-05-13 17:08:22 -07:00
Stanislav Malyshev
de95dc7297 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
 2014-05-13 17:08:06 -07:00