diff options
| author | Ondřej Surý <ondrej@sury.org> | 2015-01-26 11:52:53 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2015-01-26 11:52:53 +0100 |
| commit | 832b62efb8fceebb220116d8024d945a9bd31d7e (patch) | |
| tree | e3c65d02b50180c7d7d7c21626d403d2eb87793a /ext/pdo/pdo_stmt.c | |
| parent | 60fede4c90746ef3408ed27a15dd405b3a46a83b (diff) | |
| download | php-832b62efb8fceebb220116d8024d945a9bd31d7e.tar.gz | |
New upstream version 5.6.5+dfsgupstream/5.6.5+dfsg
Diffstat (limited to 'ext/pdo/pdo_stmt.c')
| -rw-r--r-- | ext/pdo/pdo_stmt.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 7579a7ad6..b1d87a812 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -1129,7 +1129,6 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value, } PHP_VAR_UNSERIALIZE_DESTROY(var_hash); #endif -#if PHP_MAJOR_VERSION > 5 || PHP_MINOR_VERSION >= 1 if (!ce->unserialize) { zval_ptr_dtor(&val); pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "cannot unserialize class" TSRMLS_CC); @@ -1143,7 +1142,6 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value, } else { zval_ptr_dtor(&val); } -#endif } break; @@ -1244,13 +1242,6 @@ static int pdo_stmt_verify_mode(pdo_stmt_t *stmt, long mode, int fetch_all TSRML mode = stmt->default_fetch_type & ~PDO_FETCH_FLAGS; } -#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 1 - if ((flags & PDO_FETCH_SERIALIZE) == PDO_FETCH_SERIALIZE) { - pdo_raise_impl_error(stmt->dbh, stmt, "IM001", "PDO::FETCH_SERIALIZE is not supported in this PHP version" TSRMLS_CC); - return 0; - } -#endif - switch(mode) { case PDO_FETCH_FUNC: if (!fetch_all) { |