diff options
| author | Anatol Belski <ab@php.net> | 2017-12-22 16:45:25 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-12-22 16:45:25 +0100 |
| commit | 2252d8d730dca78d2434ba45b331188ea83b2314 (patch) | |
| tree | 800ad45861540a060ce570ed3dc445946d774e10 | |
| parent | a93445bf55ffe9a7cab6481ff488ad0c590d0eb6 (diff) | |
| parent | 77b0e2fd3f5e76f12bdd4a66f64e553bc35cb37d (diff) | |
| download | php-git-2252d8d730dca78d2434ba45b331188ea83b2314.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix wrong return value for fail case in set attribute handler in pdo_odbc
| -rw-r--r-- | ext/pdo_odbc/odbc_driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c index f347acba31..4dfceb5bef 100644 --- a/ext/pdo_odbc/odbc_driver.c +++ b/ext/pdo_odbc/odbc_driver.c @@ -347,7 +347,7 @@ static int odbc_handle_set_attr(pdo_dbh_t *dbh, zend_long attr, zval *val) strcpy(H->einfo.last_err_msg, "Unknown Attribute"); H->einfo.what = "setAttribute"; strcpy(H->einfo.last_state, "IM001"); - return -1; + return 0; } } |