clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,080 Commits 491 Branches 1,363 Tags 836 MiB
3f07a256f7
Commit Graph

22 Commits

Author SHA1 Message Date
Xinchen Hui
9374977d21 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/opcache/Optimizer/pass1_5.c
 2015-12-17 14:30:00 +08:00
Lior Kaplan
ef9ddd0d82 Remove sqlite extension leftover references (was removed in PHP 5.4) 2015-12-16 09:40:02 +02:00
Stanislav Malyshev
ed709d5aa0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  fix test
  update NEWS
  Fix bug #70019 - limit extracted files to given directory
  Do not do convert_to_* on unserialize, it messes up references
  Fix #69793 - limit what we accept when unserializing exception
  Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
  Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
  ignore signatures for packages too
  Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
  Fixed bug #69892
  Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
  Improved fix for Bug #69441
  Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
  Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
  Fix bug #70081: check types for SOAP variables

Conflicts:
	ext/soap/php_http.c
	ext/spl/spl_observer.c
 2015-08-04 15:29:13 -07:00
Stanislav Malyshev
69ed3969dd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #70019 - limit extracted files to given directory
  Do not do convert_to_* on unserialize, it messes up references
  Fix #69793 - limit what we accept when unserializing exception
  Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
  Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
  ignore signatures for packages too
  Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
  Fixed bug #69892
  Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
  Improved fix for Bug #69441
  Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
  Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
  Fix bug #70081: check types for SOAP variables

Conflicts:
	.gitignore
	ext/date/php_date.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
 2015-08-04 14:10:57 -07:00
Stanislav Malyshev
c7d3c027d5 ignore signatures for packages too 2015-08-01 22:01:32 -07:00
Stanislav Malyshev
97047e7665 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
  fix test
  update NEWS
  Fix bug #70019 - limit extracted files to given directory
  Do not do convert_to_* on unserialize, it messes up references
  Fix #69793 - limit what we accept when unserializing exception
  Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
  Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
  ignore signatures for packages too
  Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
  Fixed bug #69892
  Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
  Improved fix for Bug #69441
  Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
  Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
  Fix bug #70081: check types for SOAP variables

Conflicts:
	Zend/zend_exceptions.c
	ext/date/php_date.c
	ext/openssl/openssl.c
	ext/phar/phar_internal.h
	ext/soap/php_http.c
	ext/spl/spl_array.c
	ext/spl/spl_dllist.c
	ext/spl/spl_observer.c
	ext/standard/tests/serialize/bug69152.phpt
	sapi/cli/tests/005.phpt
 2015-08-04 16:14:24 -07:00
Kalle Sommer Nielsen
db22946b25 Remove these old references to the DSP files we don't use anymore 2015-06-22 13:29:42 +02:00
Francois Laupretre
0683255dad Add missing path to .gitignore 2015-06-17 12:45:41 +02:00
Ferenc Kovacs
6cf6b58e35 add a custom built pear installer until we have an official release with php7 compat. see https://github.com/pear/pear-core/pull/33 for the details 2015-01-26 11:14:54 +01:00
Ferenc Kovacs
26c5143a7f Merge branch 'PHP-5.6' 
* PHP-5.6:
  we also have xz release tarballs since 5.5
  5.5.19 now
 2014-10-02 22:33:10 +02:00
Ferenc Kovacs
7a529790b2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  we also have xz release tarballs since 5.5
  5.5.19 now

Conflicts:
	configure.in
	main/php_version.h
 2014-10-02 22:32:18 +02:00
Ferenc Kovacs
d7b01aff89 we also have xz release tarballs since 5.5 2014-10-02 22:28:19 +02:00
Florian MARGAINE
cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Nuno Lopes
51ce4bd87c add a few more patterns to .gitignore 2014-08-31 15:19:14 +01:00
Bob Weinand
4784d99866 Added autogenerated phpdbg parser files to .gitignore 2014-04-22 00:19:38 +02:00
Will Fitch
c0acb9d5f6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update gitignore and Makefile for additional entries
 2014-01-23 21:34:57 -05:00
Will Fitch
c4c10a222e Update gitignore and Makefile for additional entries 2014-01-23 21:28:45 -05:00
Sebastian Bergmann
67a7a66466 Ignore Zend/zend_dtrace_gen.h and Zend/zend_dtrace_gen.hbak 2012-12-16 09:07:55 +01:00
Xinchen Hui
27208de763 Ignore the tempoary files 2012-03-22 17:22:17 +08:00
Xinchen Hui
7aa2b75db2 Ignore the temporay files in sapi/*/tests/ 2012-03-20 17:20:15 +08:00
Sebastian Bergmann
bcd19cf649 Add missing files. 2012-03-19 18:25:37 +01:00
David Soria Parra
887ee455dc Add .gitignore 
The gitignore file was created using git svn show-ignore and the overlapping
patterns were removed.
 2012-03-19 15:58:34 +01:00