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
93,165 Commits 491 Branches 1,363 Tags 846 MiB
57a2a8d4fa
Commit Graph

93165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
57a2a8d4fa datatype fixes 2016-01-11 08:52:54 +01:00
Anatol Belski
23fa54b908 fix typo for #ifdef 2016-01-11 08:37:16 +01:00
Xinchen Hui
8bfa5193d5 Fix various bugs in interbase 
Also read: https://marc.info/?l=php-internals&m=145077389117375&w=2
 2016-01-11 08:32:47 +01:00
Andrea Faulds
ae50a0c0be Fix bug #71314 2016-01-08 17:20:52 +00: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
caae1191da allow static build of ext/ftp 2016-01-08 08:07:15 +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
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
16a2b47394 Fixed bug #71300 (Segfault in zend_fetch_string_offset) 2016-01-07 07:05:17 -08:00
Bob Weinand
83cb751047 Fix accidental zval_dtor() usage 2016-01-07 15:12: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
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
033d608771 Fixed bug #71297 (Memory leak with yield from) 2016-01-07 11:56:21 +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
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
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
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
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
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
Stanislav Malyshev
13750cb0a1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  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-05 19:38:29 -08:00
Stanislav Malyshev
74dcbe1299 Update NEWS 2016-01-05 19:28:24 -08:00
Xinchen Hui
ce2b2f7e0a Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2016-01-06 00:02:53 +08:00
George Wang
69112d7e97 Fixed runtime php.ini override, ini name length is off by 1. 
(cherry picked from commit 5bcb7a7019)
 2016-01-05 23:48:42 +02:00
Anatol Belski
1dc395c8c4 improve fix for bug #71273 2016-01-05 20:03:05 +01:00
Anatol Belski
8d630f7d15 update NEWS 2016-01-05 18:57:38 +01:00
Anatol Belski
9a07245b72 Fixed bug #71273 A wrong ext directory setup in php.ini leads to crash 2016-01-05 18:54:46 +01:00
Xinchen Hui
695e8b79af Fixed bug #71287 (Error message contains hexadecimal instead of decimal number) 2016-01-06 00:01:44 +08:00
Bob Weinand
654c8aedd1 Fixed bug #71275 (Bad method called on cloning an object having a trait) 2016-01-05 16:27:24 +01:00
Xinchen Hui
d4da32d312 Fixed bug #71280 (ibase_blob_add() expects parameter 2 to be resorce) 2016-01-05 23:02:17 +08:00
Anatol Belski
af960fcba4 add NEWS entries for 7.0.2 2016-01-05 13:06:00 +01:00
Julien Pauli
736b91c650 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)

Conflicts:
	ext/json/php_json_encoder.h
	sapi/continuity/capi.c
 2016-01-04 18:13:38 +01:00
Jakub Zelenka
0ea63cb2a8 Fix small CS label issue in openssl.c 2016-01-04 16:52:52 +00:00
Anatol Belski
cf1c50957b re-apply the patch from 1785d2b805 
too many conflicts to cherry-pick
 2016-01-04 17:52:37 +01:00
Dominic Luechinger
e4bdf51f0a Replaced whitespaces with tabs and fixed aligments 2016-01-04 16:46:32 +00:00
Stanislav Malyshev
82865dda71 Improve fix for bug #70976 2016-01-04 17:37:54 +01:00