From: Florian MARGAINE <florian@margaine.com>
Date: Sat, 20 Sep 2014 08:09:21 +0000 (+0200)
Subject: Merge branch 'master' into issue-67910
X-Git-Tag: PRE_NATIVE_TLS_MERGE~158^2~82^2~3^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8eb7e7bf7f63f49e97f112871df47c6d6213e715;p=php

Merge branch 'master' into issue-67910

Conflicts:
	README.PARAMETER_PARSING_API
	ext/gmp/tests/001.phpt
---

8eb7e7bf7f63f49e97f112871df47c6d6213e715
diff --cc README.PARAMETER_PARSING_API
index 446b5811e5,ab6250259a..46e190efc1
--- a/README.PARAMETER_PARSING_API
+++ b/README.PARAMETER_PARSING_API
@@@ -227,7 -221,4 +221,3 @@@ if (zend_parse_parameters(ZEND_NUM_ARGS
  for (i = 0; i < num_varargs; i++) {
      /* do something with varargs[i] */
  }
--
- if (varargs) {
-     efree(varargs);
- }