]> granicus.if.org Git - php/commitdiff
Merge branch 'master' into issue-67910
authorFlorian MARGAINE <florian@margaine.com>
Sat, 20 Sep 2014 08:09:21 +0000 (10:09 +0200)
committerFlorian MARGAINE <florian@margaine.com>
Sat, 20 Sep 2014 08:09:21 +0000 (10:09 +0200)
Conflicts:
README.PARAMETER_PARSING_API
ext/gmp/tests/001.phpt

20 files changed:
1  2 
README.PARAMETER_PARSING_API
build/build.mk
configure.in
ext/interbase/php_ibase_udf.c
ext/intl/collator/collator_sort.c
ext/mssql/php_mssql.c
ext/mysqli/mysqli_warning.c
sapi/apache/mod_php7.c
sapi/apache/mod_php7.h
sapi/apache/php_apache_http.h
sapi/apache2filter/php_apache.h
sapi/apache2filter/sapi_apache2.c
sapi/apache_hooks/mod_php7.h
sapi/caudium/caudium.c
sapi/isapi/php7isapi.c
sapi/nsapi/nsapi.c
sapi/pi3web/pi3web_sapi.c
sapi/roxen/roxen.c
win32/build/Makefile
win32/build/config.w32

index 446b5811e55128fedecbdff283443bed8c0055d2,ab6250259a5f68bb4e9b8b25d8d0c575f426a367..46e190efc1795872cc0e3d39585dc9ba6a08826b
@@@ -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);
- }
diff --cc build/build.mk
Simple merge
diff --cc configure.in
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge