com php-src: Merge branch 'PHP-7.0': ext/pdo/pdo_stmt.c

From: Date: Tue, 12 Jul 2016 09:25:20 +0000
Subject: com php-src: Merge branch 'PHP-7.0': ext/pdo/pdo_stmt.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92958@lists.php.net to get a copy of this message
Commit: 1a7e39a469ebb5c6fd3c4341205bb1f871b086f0 Author: Julien Pauli <jpauli@php.net> Tue, 12 Jul 2016 11:25:20 +0200 Parents: 556cbfb6c334f7bb31c87021af47dbb83a0c4012 ca08ed417ecb6345862e3c3315c4dc2e1d46f066 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a7e39a469ebb5c6fd3c4341205bb1f871b086f0 Log: Merge branch 'PHP-7.0' * PHP-7.0: Updated NEWS Updated NEWS Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT. Conflicts: ext/pdo/pdo_stmt.c Bugs: https://bugs.php.net/52384 Changed paths: MM ext/pdo/pdo_stmt.c Diff: diff --cc ext/pdo/pdo_stmt.c index 2d57f9c,3437869..07e7957 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@@ -2125,10 -2126,10 +2126,10 @@@ static PHP_METHOD(PDOStatement, debugDu php_stream_printf(out, "Key: Name: [%zd] %.*s\n", ZSTR_LEN(key), (int) ZSTR_LEN(key), ZSTR_VAL(key)); } else { - php_stream_printf(out, "Key: Position #%pd:\n", num); + php_stream_printf(out, "Key: Position #" ZEND_ULONG_FMT ":\n", num); } - php_stream_printf(out, "paramno=" ZEND_LONG_FMT "\nname=[%zd] \"%.*s\"\nis_param=%d\nparam_type=%d\n", - php_stream_printf(out, "paramno=%pd\nname=[%zd] \"%.*s\"\nis_param=%d\nparam_type=%d\nis_input_output=%d\n", ++ php_stream_printf(out, "paramno=" ZEND_LONG_FMT "\nname=[%zd] \"%.*s\"\nis_param=%d\nparam_type=%d\nis_input_output=%d\n", param->paramno, param->name ? ZSTR_LEN(param->name) : 0, param->name ? (int) ZSTR_LEN(param->name) : 0, param->name ? ZSTR_VAL(param->name) : "", param->is_param,

« previous php.cvs (#92958) next »