clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 05:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
87,126 Commits 494 Branches 1,367 Tags 786 MiB
df4aaa81ef
Commit Graph

87126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi Collet
df4aaa81ef Fix Bug #68713 infinite loop / infinite free 
PHP not affected (emalloc never return NULL)
Just to reduce diff with upstream and for legibility

Apply:
3c0d2203b2
4af76c97a4
 2015-01-03 08:34:27 +01:00
Ferenc Kovacs
c3b44b1175 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixes #67960 - Long/short day names reversed in jddayofweek()

Conflicts:
	ext/calendar/calendar.c
 2015-01-02 10:16:37 +01:00
Ferenc Kovacs
fe46966678 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixes #67960 - Long/short day names reversed in jddayofweek()
 2015-01-02 10:15:01 +01:00
Greg Roach
244fc1e053 Fixes #67960 - Long/short day names reversed in jddayofweek() 2015-01-02 10:14:12 +01:00
Anatol Belski
95e04fed24 cleanup redundand macros 2014-12-31 16:25:42 +01:00
Sara Golemon
365f428d46 Allow the third arg to DateTime(Immutable)::createFromFormat() to be null. 
Permit the same meaning as not passing the arg at all.
 2014-12-30 13:58:59 -08:00
Anatol Belski
ef19072af2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated libmagic.patch
  updated libmagic.patch
 2014-12-30 20:28:52 +01:00
Anatol Belski
fa0b5e2c6d updated libmagic.patch 2014-12-30 20:28:13 +01:00
Anatol Belski
ce6cbb3110 updated libmagic.patch 2014-12-30 20:22:51 +01:00
Anatol Belski
a0cf63f526 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated libmagic.patch
 2014-12-30 20:22:08 +01:00
Anatol Belski
99162b8198 updated libmagic.patch 2014-12-30 20:21:28 +01:00
Anatol Belski
a78eaddbe0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed bug #68671 incorrect expression in libmagic

Conflicts:
	ext/fileinfo/libmagic/print.c
 2014-12-30 19:41:07 +01:00
Anatol Belski
85b4a65520 updated NEWS 2014-12-30 19:39:14 +01:00
Anatol Belski
091ea62262 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68671 incorrect expression in libmagic
 2014-12-30 19:38:08 +01:00
Anatol Belski
d92a87d7cb Fixed bug #68671 incorrect expression in libmagic 2014-12-30 19:37:27 +01:00
Adam Harvey
2d561e0e26 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Check the return value of lo_export.
 2014-12-30 18:01:51 +00:00
Adam Harvey
3ef6e3726c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Check the return value of lo_export.
 2014-12-30 17:59:39 +00:00
Adam Harvey
211f4ceeae Check the return value of lo_export. 
Patch by Ondřej Surý. Fixes bug #68697 (lo_export return -1 on failure).
 2014-12-30 17:47:19 +00:00
Anatol Belski
68d212748d Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream
  remove BOM from NEWS
 2014-12-30 16:52:54 +01:00
Anatol Belski
ab3a746a2d updated NEWS 2014-12-30 16:52:17 +01:00
Anatol Belski
3485925a3a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream
  remove BOM from NEWS
 2014-12-30 16:51:06 +01:00
Anatol Belski
d5123415f6 Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream 2014-12-30 16:50:22 +01:00
Anatol Belski
6e36ded569 remove BOM from NEWS 2014-12-30 16:47:10 +01:00
Dmitry Stogov
aa8ecbedcb Simplify array_splice() 2014-12-30 18:15:15 +03:00
Dmitry Stogov
c6bc209e50 Simplify array_unshift() 2014-12-30 17:04:24 +03:00
Dmitry Stogov
f9a70c50a4 Simplify array_pad() 2014-12-30 17:03:38 +03:00
Stanislav Malyshev
16b904cc1c Merge branch 'PHP-5.6' 
* PHP-5.6:
  FIx bug #68618 (out of bounds read crashes php-cgi)
  Fixed bug #68676 (Explicit Double Free)
  Fixed bug #68676 (Explicit Double Free)
 2014-12-30 01:27:20 -08:00
Stanislav Malyshev
4c0f17caca Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  FIx bug #68618 (out of bounds read crashes php-cgi)
  Fixed bug #68676 (Explicit Double Free)
 2014-12-30 01:26:53 -08:00
Stanislav Malyshev
71c970077d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  FIx bug #68618 (out of bounds read crashes php-cgi)
 2014-12-30 01:26:00 -08:00
Stanislav Malyshev
f9ad308669 FIx bug #68618 (out of bounds read crashes php-cgi) 2014-12-30 01:23:05 -08:00
Stanislav Malyshev
f2fc1bdb33 Make the code lesss suspicious (can't be really 0 but it's not obvious) 2014-12-30 00:16:21 -08:00
Stanislav Malyshev
949ffc0a8f Merge branch 'intl_size_t' 
* intl_size_t:
  cleanup intl types
 2014-12-29 15:04:00 -08:00
Stanislav Malyshev
82f3d36583 cleanup intl types 2014-12-29 14:06:12 -08:00
Dmitry Stogov
6b20895c21 Use HashTable.u.flags instead of HashTable.arHash to check if HashTable is properly initialized 2014-12-30 00:14:13 +03:00
Stanislav Malyshev
ee7decb7ff Revert "Add type info for spl_autoload_register" 
This reverts commit ad728725cb.

Revert the change for now, probably needs better handling with account to BC
or joined with exceptions-in-engine RFC.
 2014-12-29 09:50:00 -08:00
Andrea Faulds
41e3fdba8e Make zend_parse_parameters share fast zpp implementation where possible 
Rename shared implementation functions and build them unconditionally

Don't fail on empty path for zend_parse_arg_path

Update type names

Fix behaviour of by-reference "z"

Make 'o' use zend_parse_arg_object

Fix NULL string check in zend_parse_arg_path(_str)
 2014-12-29 12:28:28 +00:00
Dmitry Stogov
cd5ea1619e Micro optimization for better register allocation 2014-12-29 14:21:16 +03:00
Dmitry Stogov
0fa50fb95d Reored conditions 2014-12-29 14:20:52 +03:00
Dmitry Stogov
d909a837e2 Cleanup 2014-12-29 13:38:36 +03:00
Kalle Sommer Nielsen
fbf3a6bc1a Fixed bug #68676 (Explicit Double Free) 2014-12-29 11:04:23 +01:00
Kalle Sommer Nielsen
bb3bcf0c5d Merge branch 'master' of https://git.php.net/push/php-src 2014-12-29 11:00:15 +01:00
Kalle Sommer Nielsen
24125f0f26 Fixed bug #68676 (Explicit Double Free) 2014-12-29 10:57:42 +01:00
Kalle Sommer Nielsen
2bcf69d073 Fixed bug #68676 (Explicit Double Free) 2014-12-29 10:55:14 +01:00
Stanislav Malyshev
78d7ad27e2 eliminate usage of deprecated zend_get_parameters_ex 2014-12-28 23:46:42 -08:00
Stanislav Malyshev
b946621333 fix "comparing size_t to <0" warning 2014-12-28 23:46:28 -08:00
Stanislav Malyshev
983fdb25ea fix typo 2014-12-28 23:18:12 -08:00
Kalle Sommer Nielsen
334b9718d5 Fix tests I broke with the E_ERROR > E_RECOVERABLE_ERROR change 2014-12-29 07:54:44 +01:00
Xinchen Hui
3bd96e0735 Use internd string as key 2014-12-29 14:35:08 +08:00
Xinchen Hui
f579ae81c9 Fixed build of litespped 2014-12-29 13:46:01 +08:00
Kalle Sommer Nielsen
c0b56232ba Be verbose if --with-mp is enabled 2014-12-28 19:40:33 +01:00