php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
87,131 Commits 549 Branches 1,486 Tags
ebb67cd6fead10588ee546def89628b2676f77bb
Commit Graph

87131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Broerman ebb67cd6fe Renamed timeval functions to comply with PHP naming standards 2015-01-21 10:20:32 -05:00
Brad Broerman 9ec7fac127 Change declaration of subtractTimeval and compareTimeval to static 2015-01-10 11:19:17 -05:00
Brad Broerman 8ded274413 Re-ordered the read and write methods to match the order of the original code, to make the DIFF easier to read. 2014-12-31 13:30:48 -05:00
Brad Broerman fea9253c1c try to update mod 2014-12-31 10:59:57 -05:00
Brad Broerman f22c3d643a Fixed indentation 2014-12-31 10:49:21 -05:00
Brad Broerman 49571cfad7 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	ext/openssl/xp_ssl.c
 2014-12-30 19:44:45 -05: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