Merge branch 'master' of https://github.com/php/php-src

Author: cpriest

Zend/tests/generators/finally_ran_on_close.phpt

@@ -5,14 +5,18 @@ finally is run even if a generator is closed mid-execution
 
 function gen() {
     try {
-        echo "before yield\n";
-        yield;
-        echo "after yield\n";
+        try {
+            echo "before yield\n";
+            yield;
+            echo "after yield\n";
+        } finally {
+            echo "finally run\n";
+        }
+        echo "code after finally\n";
     } finally {
-        echo "finally run\n";
+        echo "second finally run\n";
     }
-
-    echo "code after finally\n";
+    echo "code after second finally\n";
 }
 
 $gen = gen();
@@ -23,3 +27,4 @@ unset($gen);
 --EXPECT--
 before yield
 finally run
+second finally run

Zend/zend_generators.c

@@ -60,6 +60,7 @@ void zend_generator_close(zend_generator *generator, zend_bool finished_executio
 				 * the resume. */
 				if (finally_op_num) {
 					execute_data->opline = &op_array->opcodes[finally_op_num];
+					execute_data->fast_ret = NULL;
 					generator->flags |= ZEND_GENERATOR_FORCED_CLOSE;
 					zend_generator_resume(generator TSRMLS_CC);
 					return;

ext/imap/php_imap.c

@@ -1191,7 +1191,7 @@ static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 							if (zend_hash_index_find(Z_ARRVAL_PP(disabled_auth_method), i, (void **) &z_auth_method) == SUCCESS) {
 								if (Z_TYPE_PP(z_auth_method) == IS_STRING) {
 									if (Z_STRLEN_PP(z_auth_method) > 1) {
-										mail_parameters (NIL, DISABLE_AUTHENTICATOR, (void *)Z_STRVAL_PP(disabled_auth_method));
+										mail_parameters (NIL, DISABLE_AUTHENTICATOR, (void *)Z_STRVAL_PP(z_auth_method));
 									}
 								} else {
 									php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid argument, expect string or array of strings");

ext/imap/tests/bug63126.phpt

@@ -0,0 +1,52 @@
+--TEST--
+imap_open() DISABLE_AUTHENTICATOR ignores array param
+--SKIPIF--
+<?php
+extension_loaded('imap') or die('skip imap extension not available in this build');
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+$in = imap_open($default_mailbox, $username, $password, OP_HALFOPEN, 1);
+if (!$in) {
+    die("skip could not connect to mailbox $default_mailbox");
+}
+$kerberos = false;
+if (is_array($errors = imap_errors())) {
+    foreach ($errors as $err) {
+        if (strstr($err, 'GSSAPI') || strstr($err, 'Kerberos')) {
+            $kerberos = true;
+        }
+    }
+}
+if (!$kerberos) {
+    die("skip need a GSSAPI/Kerberos aware server");
+}
+?>
+--FILE--
+<?php
+$tests = array(
+    'Array'  => array('DISABLE_AUTHENTICATOR' => array('GSSAPI','NTLM')),
+    'String' => array('DISABLE_AUTHENTICATOR' => 'GSSAPI'),
+);
+require_once(dirname(__FILE__).'/imap_include.inc');
+foreach ($tests as $name => $testparams) {
+    echo "Test for $name\n";
+    $in = imap_open($default_mailbox, $username, $password, OP_HALFOPEN, 1, $testparams);
+    if ($in) {
+        if (is_array($errors = imap_errors())) {
+            foreach ($errors as $err) {
+                if (strstr($err, 'GSSAPI') || strstr($err, 'Kerberos')) {
+                    echo "$err\n";
+                }
+            }
+        }
+    } else {
+        echo "Can't connect\n";
+    }
+}
+echo "Done\n";
+?>
+--EXPECTF--
+Test for Array
+Test for String
+Done

ext/sqlite3/config0.m4

@@ -50,6 +50,9 @@ if test $PHP_SQLITE3 != "no"; then
     PHP_CHECK_LIBRARY(sqlite3,sqlite3_key,[
       AC_DEFINE(HAVE_SQLITE3_KEY, 1, [have commercial sqlite3 with crypto support])
     ])
+    PHP_CHECK_LIBRARY(sqlite3,sqlite3_column_table_name,[
+      AC_DEFINE(SQLITE_ENABLE_COLUMN_METADATA, 1, [have sqlite3 with column metadata enabled])
+    ])
 
     PHP_CHECK_LIBRARY(sqlite3,sqlite3_load_extension,
     [],