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
94,084 Commits 549 Branches 1,487 Tags
e6ed53e011bee5ebb681e5a13db31ee7f08ef3d2
Commit Graph

94084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrea Faulds e6ed53e011 Merge branch 'PHP-7.0' 2016-01-08 17:21:59 +00:00
Andrea Faulds ae50a0c0be Fix bug #71314 2016-01-08 17:20:52 +00:00
Anatol Belski c8ff622f6d Merge branch 'PHP-7.0' 
* PHP-7.0:
  update libs_versions.txt
  update libs versions
 2016-01-08 08:36:43 +01:00
Anatol Belski c7256095c5 update libs_versions.txt 2016-01-08 08:36:21 +01:00
Anatol Belski a98f6dad00 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update libs versions
 2016-01-08 08:35:17 +01:00
Anatol Belski 07133ae649 update libs versions 2016-01-08 08:33:55 +01:00
Anatol Belski d7eb63422a Merge branch 'PHP-7.0' 
* PHP-7.0:
  allow static build of ext/ftp
  update NEWS
  Fixed bug #71227 Can't compile php_curl statically
 2016-01-08 08:08:45 +01:00
Anatol Belski caae1191da allow static build of ext/ftp 2016-01-08 08:07:15 +01:00
Nikita Popov bb357e0617 Fix bitset initialization 2016-01-07 23:49:42 +01:00
Anatol Belski e885cd817c Fixed bug #71227 Can't compile php_curl statically 2016-01-07 18:58:59 +01:00
Anatol Belski 0e808b2332 update NEWS 2016-01-07 18:56:53 +01:00
Anatol Belski 1fb763ccab Fixed bug #71227 Can't compile php_curl statically 2016-01-07 18:55:05 +01:00
Nikita Popov c602ac60b9 Fix CE fetching for NEW object type inference 
Create a common function for getting a class entry.
 2016-01-07 18:53:10 +01:00
Nikita Popov 04dc5d7420 Range&type inference for JMP_SET 2016-01-07 18:53:02 +01:00
Anatol Belski e712764dfe Merge branch 'PHP-7.0' 
* PHP-7.0:
  more informative error message for opcache fallback
  add SKIPIF condition
 2016-01-07 17:58:44 +01:00
Anatol Belski e72848c171 more informative error message for opcache fallback 2016-01-07 17:57:41 +01:00
Anatol Belski 42a145273c add SKIPIF condition 2016-01-07 17:54:26 +01:00
Xinchen Hui 9c2dde98db Merge branch 'PHP-7.0' 2016-01-07 07:05:31 -08:00
Xinchen Hui 16a2b47394 Fixed bug #71300 (Segfault in zend_fetch_string_offset) 2016-01-07 07:05:17 -08:00
Bob Weinand abae897a24 Merge branch 'PHP-7.0' 2016-01-07 15:13:07 +01:00
Bob Weinand 83cb751047 Fix accidental zval_dtor() usage 2016-01-07 15:12:50 +01:00
Julien Pauli 93058cd323 Merge branch 'PHP-7.0' 
* PHP-7.0:
  5.5.32 now
 2016-01-07 13:55:50 +01:00
Julien Pauli da0eeacf1d Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  5.5.32 now
 2016-01-07 13:55:42 +01:00
Julien Pauli bd2229e709 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.5.32 now

Conflicts:
	configure.in
	main/php_version.h
 2016-01-07 13:55:09 +01:00
Julien Pauli a6734f70e1 5.5.32 now 2016-01-07 13:07:23 +01:00
Julien Pauli 9e5c75d934 Merge branch 'PHP-7.0' 
* PHP-7.0:
  5.5.32 now
 2016-01-07 13:06:21 +01:00
Julien Pauli a95f36fa7b Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  5.5.32 now
 2016-01-07 13:05:57 +01:00
Julien Pauli 2d0215b063 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.5.32 now

Conflicts:
	configure.in
	main/php_version.h
 2016-01-07 13:05:38 +01:00
Julien Pauli 96c205b5f6 5.5.32 now 2016-01-07 13:04:35 +01:00
Bob Weinand 13ccb2ff08 Merge branch 'PHP-7.0' 2016-01-07 11:56:51 +01:00
Bob Weinand 033d608771 Fixed bug #71297 (Memory leak with yield from) 2016-01-07 11:56:21 +01:00
Ferenc Kovacs 536f583154 Merge branch 'PHP-7.0' 
* PHP-7.0:
  adjust release date for the delay
 2016-01-06 15:55:36 +01:00
Ferenc Kovacs 42e0fff928 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  adjust release date for the delay
 2016-01-06 15:55:17 +01:00
Ferenc Kovacs b095a22a3b adjust release date for the delay 2016-01-06 15:54:55 +01:00
Ferenc Kovacs 8cc263ba5c Merge branch 'PHP-7.0' 
* PHP-7.0:
  these will be part of 5.6.17 not 5.6.18
  Removed unecessary string dup
  Moved buffer from heap to stack
 2016-01-06 15:50:10 +01:00
Ferenc Kovacs a9a7926df5 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  these will be part of 5.6.17 not 5.6.18
  Removed unecessary string dup
  Moved buffer from heap to stack
 2016-01-06 15:49:06 +01:00
Ferenc Kovacs 6802a9f28a these will be part of 5.6.17 not 5.6.18 2016-01-06 15:23:18 +01:00
Julien Pauli 7302b72d6e Merge branch 'PHP-7.0' 
* PHP-7.0:
  Moved buffer from heap to stack
 2016-01-06 11:41:50 +01:00
Julien Pauli ef4dc15831 Moved buffer from heap to stack 2016-01-06 11:41:16 +01:00
Julien Pauli 86f48881a4 Removed unecessary string dup 2016-01-06 10:51:36 +01:00
Julien Pauli 810452f68e Moved buffer from heap to stack 2016-01-06 10:51:36 +01:00
Anatol Belski c1bfc16ea6 Merge branch 'PHP-7.0' 
* PHP-7.0:
  updated NEWS
  Patch for Heap Buffer Overflow in EscapeShell
 2016-01-06 07:53:50 +01:00
Anatol Belski 1e1c5c427e updated NEWS 2016-01-06 07:53:31 +01:00
libnex 2871c70efa Patch for Heap Buffer Overflow in EscapeShell 
Proposed patch for bug #71270
 2016-01-06 07:49:21 +01:00
Anatol Belski 4ff46b98df Merge branch 'PHP-7.0' 
* PHP-7.0:
  set release date
  fix NEWS and add some 7.0.2 entries
 2016-01-06 07:46:10 +01:00
Anatol Belski e2565eb614 set release date 2016-01-06 07:45:03 +01:00
Anatol Belski 158288b3c6 fix NEWS and add some 7.0.2 entries 2016-01-06 07:44:26 +01:00
Anatol Belski ea130bfd59 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update NEWS
  add NEWS entries for 7.0.2
  re-apply the patch from 1785d2b805
  Improve fix for bug #70976
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  fix merge mistake
  Fixed #70728
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
  Improve fix for bug #70976
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
  Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability
  Fixed #70728
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  typofix
 2016-01-06 06:10:39 +01:00
Anatol Belski c0928be7f8 Merge remote-tracking branch 'phpsec/PHP-7.0' into PHP-7.0 
* phpsec/PHP-7.0:
  add NEWS entries for 7.0.2
  re-apply the patch from 1785d2b805
  Improve fix for bug #70976
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  fix merge mistake
  Fixed #70728
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
 2016-01-06 06:09:12 +01:00
Anatol Belski d91b26d344 Merge remote-tracking branch 'origin/PHP-5.6' into PHP-7.0 
* origin/PHP-5.6:
  Update NEWS
  Improve fix for bug #70976
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
  Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability
  Fixed #70728
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  typofix
 2016-01-06 06:08:46 +01:00