Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Update more functions with path check

diff --cc ext/curl/curl_file.c
index 0fcf41acec11b7fe548e3b3f2a749fa97ea67b30,979249221de9509c1b13486c3bf1cf1629e4b8bd..7a047feb7f97e892014858a690b2291bde2b22bf
--- 1/ext/curl/curl_file.c
--- 2/ext/curl/curl_file.c
+++ b/ext/curl/curl_file.c
@@@ -32,10 -32,10 +32,10 @@@ PHP_CURL_API zend_class_entry *curl_CUR
  static void curlfile_ctor(INTERNAL_FUNCTION_PARAMETERS)
  {
        char *fname = NULL, *mime = NULL, *postname = NULL;
 -      int fname_len, mime_len, postname_len;
 +      size_t fname_len, mime_len, postname_len;
        zval *cf = return_value;
  
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ss", &fname, &fname_len, &mime, &mime_len, &postname, &postname_len) == FAILURE) {
 -      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|ss", &fname, &fname_len, &mime, &mime_len, &postname, &postname_len) == FAILURE) {
++      if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|ss", &fname, &fname_len, &mime, &mime_len, &postname, &postname_len) == FAILURE) {
                return;
        }
  

diff --cc ext/exif/exif.c
index ca0190754f8d3c18a69b4020f9464c5d0a5c0c2d,1c8772f76be691b7b3f77ca31eb788a2abbcefe5..5de48bd00aa910a4edd3ec7b0ea70dede9eedc06
--- 1/ext/exif/exif.c
--- 2/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@@ -4203,7 -4210,7 +4203,7 @@@ PHP_FUNCTION(exif_imagetype
        php_stream * stream;
        int itype = 0;
  
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &imagefile, &imagefile_len) == FAILURE) {
 -      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p", &imagefile, &imagefile_len) == FAILURE) {
++      if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &imagefile, &imagefile_len) == FAILURE) {
                return;
        }
  

diff --cc ext/zip/php_zip.c
index 20c4e86de0bd5853e7dcf7a63ce29f1b02f8e22b,52f058c70874ef49429e3d4002fae292400543ad..e741226c249af3983191f7e4de3ef4fa41d588a2
--- 1/ext/zip/php_zip.c
--- 2/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@@ -2617,7 -2662,7 +2617,7 @@@ static ZIPARCHIVE_METHOD(extractTo
                RETURN_FALSE;
        }
  
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|z", &pathto, &pathto_len, &zval_files) == FAILURE) {
 -      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|z", &pathto, &pathto_len, &zval_files) == FAILURE) {
++      if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|z", &pathto, &pathto_len, &zval_files) == FAILURE) {
                return;
        }