php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-30 03:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
74,637 Commits 549 Branches 1,487 Tags
94e4c4df86719dbdf265b9d7ccfd1db8cfd32fdf
Commit Graph

74637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Soria Parra 94e4c4df86 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
 2013-09-18 15:06:51 +02:00
David Soria Parra 7a24ee13ec Revert "EmptyIterator now implements Countable; fixes bug 60577" 
This reverts commit 8a936e8eb9.
 2013-09-18 15:06:36 +02:00
David Soria Parra 2eb5661886 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  RFC 6598 reserved ip range starts at 100.64.0.0
 2013-09-18 14:28:57 +02:00
David Soria Parra 7e9044b6a2 RFC 6598 reserved ip range starts at 100.64.0.0 2013-09-18 14:27:58 +02:00
Michael Wallner a34b141e08 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix a very rare case of use of uninitialized value combined with a memleak
 2013-09-18 11:12:11 +02:00
Michael Wallner 9bfd55cda3 fix a very rare case of use of uninitialized value combined with a 
memleak
 2013-09-18 11:10:55 +02:00
David Soria Parra 5e3da04fb0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
 2013-09-17 09:55:03 +02:00
David Soria Parra dfd7d1063a NEWS for added reserved ip addresses according to RFC 6598 2013-09-17 09:54:58 +02:00
Sebastian Nohn 7c279df6ae Add RFC 6598 IPs to reserved addresses 
(cherry picked from commit b3f5b822e9)
 2013-09-17 09:52:53 +02:00
David Soria Parra 3d6ac70e66 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
 2013-09-16 23:36:37 +02:00
David Soria Parra 6a0b90da84 NEWS for #60577 2013-09-16 16:23:29 +02:00
David Soria Parra 1939d9e3db NEWS for bug #64441 2013-09-16 16:21:35 +02:00
Michael Wallner b5283b9b7a double test timeout for travis 2013-09-16 09:35:08 +02:00
Xinchen Hui 1916aaa272 Add test for ISSUE #128 2013-09-16 14:58:18 +08:00
Xinchen Hui 46f18ccf0d Fixed bug #65665 (Exception not properly caught when opcache enabled) 2013-09-16 14:43:01 +08:00
Alex Bobrov 18b54a2366 Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names) 
(cherry picked from commit c149d4ee4be81ecf005eafd43ede06e70aa4c985)
 2013-09-16 05:23:52 +02:00
Levi Morrison 8a936e8eb9 EmptyIterator now implements Countable; fixes bug 60577 
(cherry picked from commit 6398844c86bee08abe4ee3f206ecd86ad0a498f9)
 2013-09-16 04:04:53 +02:00
David Soria Parra c0afe829e3 News for bugfix #64157 2013-09-16 04:04:51 +02:00
Boro Sitnikovski a475b2c1db Bug 64157 
Changed error message to make sense
 2013-09-16 03:42:49 +02:00
Michael Wallner 9eaffd34c1 fix broken sha2 configure tests 
see http://patch-tracker.debian.org/patch/series/view/php5/5.5.3+dfsg-1/fix_broken_sha2_test.patch
 2013-09-13 12:56:26 +02:00
Levi Morrison d76959a3b9 Fixed minor bug in test. 2013-09-12 23:29:52 +02:00
Nikita Popov 506a61549f Move NEWS entries to correct version 
Accidentially inserted NEWS entries in previous release.
 2013-09-12 18:24:58 +02:00
Nikita Popov ad976d8240 Fix bug #64782: SplFileObject constructor make $context optional 2013-09-12 17:46:14 +02:00
Boro Sitnikovski 165f544ae9 Fix bug #65502: DateTimeImmutable::createFromFormat returns DateTime 
DateTimeImmutable::createFromFormat should call
date_create_immutable_from_format instead of date_create_from_format
 2013-09-12 15:21:45 +02:00
Boro Sitnikovski d7f5f1ef35 Fix bug #65548: Comparison for DateTimeImmutable doesn't work 2013-09-12 15:12:16 +02:00
Adam Harvey d209c362d2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Tinker with the wording of the short_open_tag description.
 2013-09-09 16:58:35 -07:00
Adam Harvey 160cd8d0a7 Tinker with the wording of the short_open_tag description. 
I'm still not thrilled with this, but it's a bit better and addresses the
issues noted in bug #65644. Plus, it now mentions the decoupling of <?=.
 2013-09-09 16:56:57 -07:00
Adam Harvey 144f2f1773 Fix NEWS: these commits were after 5.5.4 was branched and will be in 5.5.5. 2013-09-09 16:46:14 -07:00
Adam Harvey 8b6270271e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Handle CLI server request headers case insensitively.
  5.4.21 now

Conflicts:
	configure.in
	main/php_version.h
 2013-09-09 16:32:16 -07:00
Adam Harvey 3c3b2b5bdc Handle CLI server request headers case insensitively. 
Fixes bug #65633 (built-in server treat some http headers as case-sensitive).
 2013-09-09 16:24:49 -07:00
unknown b54b6e30a4 ensure that the defined interpolation method is used by the generic scaling functions 2013-09-09 11:56:05 +02:00
Dmitry Stogov 8d860c1218 Fixed issue #128 (opcache_invalidate segmentation fault) 2013-09-09 10:05:59 +04:00
Christopher Jones fc9d886f6c Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  5.5.5 now
 2013-09-04 05:40:24 -07:00
Julien Pauli 0e10f26e27 5.5.5 now 2013-09-04 11:22:23 +02:00
Stanislav Malyshev 7beef74a82 5.4.21 now 2013-09-03 13:38:15 -07:00
Christopher Jones 2452e7b680 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Typo....
  Add a XFAIL test for #64896
 2013-09-02 05:40:40 -07:00
Xinchen Hui b2ee1b629e Merge branch 'PHP-5.4' into PHP-5.5 2013-09-02 16:16:07 +08:00
Xinchen Hui 6c48c6bc78 Typo.... 2013-09-02 16:15:52 +08:00
Xinchen Hui dd1cbd140b Merge branch 'PHP-5.4' into PHP-5.5 2013-09-02 16:02:59 +08:00
Xinchen Hui ed038d2ee3 Add a XFAIL test for #64896 2013-09-02 16:02:24 +08:00
Christopher Jones c8b0da6ef7 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
  Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
  Update NEWS
  Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
 2013-08-30 05:40:30 -07:00
Christopher Jones bfb1fe10cb 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:
  Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
  Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
 2013-08-30 05:40:24 -07:00
Remi Collet 6fab1caa41 Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer 2013-08-30 10:45:33 +02:00
Remi Collet a5749eb0cb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
 2013-08-30 10:43:12 +02:00
Remi Collet d69513afec Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer 2013-08-30 10:42:08 +02:00
Xinchen Hui 4e3de606b5 Update NEWS 2013-08-30 11:22:58 +08:00
Xinchen Hui e4fe53e200 Merge branch 'PHP-5.4' into PHP-5.5 2013-08-30 11:20:46 +08:00
Xinchen Hui 7da6498342 Fixed bug #60598 (cli/apache sapi segfault on objects manipulation) 2013-08-30 11:20:24 +08:00
Christopher Jones a4ff610e1c Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
  Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
  Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
  Fixed compatibility with php-5.2
  Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)
  Avoid compiler warning
  Fix bug #65579 (Using traits with get_class_methods causes segfault).
 2013-08-29 05:40:27 -07:00
Christopher Jones 5bff1286b6 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:
  Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
  Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
  Avoid compiler warning
  Fix bug #65579 (Using traits with get_class_methods causes segfault).
 2013-08-29 05:40:23 -07:00