diff options
| author | Anatol Belski <ab@php.net> | 2014-12-13 19:43:45 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-13 19:43:45 +0100 |
| commit | bb66f385d09e7e55390e9f57fcbca08f6b43ff91 (patch) | |
| tree | 54defb44e55c1ebc0afa15aa60758d87a4b9ce3b /ext/pdo/pdo_stmt.c | |
| parent | dfb18b1188492efa48ade07029172c5535f65f93 (diff) | |
| parent | 0ea0b591d79ae0ee18d33533a5c701330836ff6b (diff) | |
| download | php-git-bb66f385d09e7e55390e9f57fcbca08f6b43ff91.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (37 commits)
NEWS
NEWS
Fix bug #68601 buffer read overflow in gd_gif_in.c
Fixed compilation warnings
Removed unnecessary checks
pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary
Merged PR #911.
Removed ZEND_ACC_FINAL_CLASS which is unnecessary. This also fixed some currently defined classes as final which were just not being considered as such before.
Updated NEWS
Updated NEWS
Updated NEWS
Fix bug #68532: convert.base64-encode omits padding bytes
Updated NEWS
Updated NEWS
Updated NEWS
Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)
Updated NEWS
Updated NEWS
Fix MySQLi tests
Fixed gd test
...
Diffstat (limited to 'ext/pdo/pdo_stmt.c')
| -rw-r--r-- | ext/pdo/pdo_stmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 27cc157ed7..1491c80cfd 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -2292,7 +2292,7 @@ void pdo_stmt_init(TSRMLS_D) INIT_CLASS_ENTRY(ce, "PDORow", pdo_row_functions); pdo_row_ce = zend_register_internal_class(&ce TSRMLS_CC); - pdo_row_ce->ce_flags |= ZEND_ACC_FINAL_CLASS; /* when removing this a lot of handlers need to be redone */ + pdo_row_ce->ce_flags |= ZEND_ACC_FINAL; /* when removing this a lot of handlers need to be redone */ pdo_row_ce->create_object = pdo_row_new; pdo_row_ce->serialize = pdo_row_serialize; } |