com php-src: PHP_MAJOR_VERSION == 5 && PH P_MINOR_VERSION > 1: ext/pdo/pdo_stmt.c
| From: | JulienPauli | Date: | Sat, 29 Nov 2014 10:38:36 +0000 |
| Subject: | com php-src: PHP_MAJOR_VERSION == 5 && PH P_MINOR_VERSION > 1: ext/pdo/pdo_stmt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83379@lists.php.net to get a copy of this message | ||
Commit: cf2cd8fb201f6651322ed6a07ffc9186dce57856
Author: Popa Marius Adrian <mapopa@gmail.com> Mon, 28 Apr 2014 14:27:35 +0300
Committer: Julien Pauli <jpauli@php.net> Sat, 29 Nov 2014 11:38:36 +0100
Parents: bb422cb60e69794b3ea9d7d47fcc8a976a385608
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cf2cd8fb201f6651322ed6a07ffc9186dce57856
Log:
PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
cleanup and PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
Changed paths:
M ext/pdo/pdo_stmt.c
Diff:
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 238f547...2aa242e 100644
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -1141,7 +1141,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);
@@ -1155,7 +1154,6 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value,
} else {
zval_ptr_dtor(&val);
}
-#endif
}
break;
@@ -1256,13 +1254,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) {