Dmitry Stogov
f9927a6c97
Merge mainstream 'master' branch into refactoring
...
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
Anatol Belski
a35723f6e1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix crash in MINFO when no mysqlnd plugins are loaded
2014-04-14 17:45:18 +02:00
Anatol Belski
9e76e87ca9
fix crash in MINFO when no mysqlnd plugins are loaded
2014-04-14 17:44:47 +02:00
Anatol Belski
f0c95cb705
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix syntax error in vc++
2014-04-11 13:28:13 +02:00
Anatol Belski
5c87ed058b
fix syntax error in vc++
2014-04-11 13:08:46 +02:00
Andrey Hristov
6828437c11
Merge branch 'PHP-5.6'
...
Conflicts:
NEWS
ext/mysqlnd/mysqlnd_result.c
2014-04-10 18:22:01 +03:00
Andrey Hristov
090c3e87c0
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
Conflicts:
ext/mysqli/tests/mysqli_begin_transaction.phpt
2014-04-10 16:49:13 +03:00
Andrey Hristov
63791d055a
New result fetching mode for mysqlnd, which should use less memory but
...
implies more memory copy. The old method is still available and can be used.
It stays as default. Choosing the method is through a flag to mysqli_query()/mysqli_real_query()
New mode can be forced with an INI setting, for all extensions that support this mode
(ext/mysql and mysqli, because PDO due to it's architecture can't support it)
The setting is mysqlnd.fetch_data_copy=[0|1]
2014-04-10 16:44:54 +03:00
Nikita Popov
21e01f2b70
Merge branch 'PHP-5.6'
2014-04-09 12:31:35 +02:00
Nikita Popov
eaf44ec397
Remove some usages of hashtable internals
2014-04-09 12:31:21 +02:00
Andrey Hristov
ea93d1fe83
Merge branch 'PHP-5.6'
2014-03-20 17:24:26 +02:00
Andrey Hristov
d2ab74588e
Merge branch 'PHP-5.5' into PHP-5.6
2014-03-20 16:30:01 +02:00
Andrey Hristov
41b4b84dda
Emit a warning in case of unallowed characters. Fix another place this
...
code is used - reuse
2014-03-20 16:23:40 +02:00
Andrey Hristov
8ed85557e0
Merge branch 'PHP-5.6'
2014-03-20 16:16:27 +02:00
Andrey Hristov
e52334fdbe
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/mysqli/mysqli_api.c
2014-03-20 16:16:12 +02:00
Andrey Hristov
059bc99d94
don't replace with ?, just skip it
2014-03-20 12:11:16 +02:00
Andrey Hristov
e756f417b9
Merge branch 'PHP-5.6'
2014-03-19 18:55:40 +02:00
Andrey Hristov
01c2ec03bc
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
NEWS
configure.in
ext/mysqli/mysqli_api.c
main/php_version.h
2014-03-19 18:54:39 +02:00
Andrey Hristov
d63ed101ee
Fix problem with mysqli_commt()/mysqli_rollback()
2014-03-19 18:32:19 +02:00
Andrey Hristov
5e836b443c
Merge branch 'PHP-5.6'
2014-03-10 19:16:22 +02:00
Andrey Hristov
d2a291393a
inject it directly. This is not C++ and I don't want to use hacks with similar structures
...
that are binary compatible. Better be explicit.
2014-03-10 19:15:30 +02:00
Andrey Hristov
3456d47235
Merge branch 'PHP-5.6'
2014-03-10 18:19:22 +02:00
Andrey Hristov
73f03a47d0
DI
2014-03-10 18:18:56 +02:00
Andrey Hristov
f995187d34
Merge branch 'PHP-5.6'
2014-03-10 17:26:13 +02:00
Andrey Hristov
990f9c8f3f
Switch from a single flag to a flag byte
2014-03-10 17:25:53 +02:00
Andrey Hristov
9a112e00cd
Merge branch 'PHP-5.6'
2014-03-10 12:55:53 +02:00
Andrey Hristov
c8033ac207
Merge branch 'PHP-5.5' into PHP-5.6
2014-03-10 12:53:17 +02:00
Andrey Hristov
3a76cb2d95
Fix indentation
2014-03-10 12:52:56 +02:00
Andrey Hristov
529fdd5bb0
Merge branch 'PHP-5.6'
2014-03-05 16:24:43 +02:00
Andrey Hristov
6b804b96b8
Refactor the result set data structures. Move more to the buffered and unbuffered
...
substructures. Add methods to these too. Preparing for pluggable interface for
returning data to the engine (zvals, c-style, something else)
2014-03-05 16:22:23 +02:00
Andrey Hristov
f3e59b838e
Merge branch 'PHP-5.6'
2014-02-17 19:04:14 +02:00
Andrey Hristov
3e59f041da
remove dead code
2014-02-17 19:04:01 +02:00
Andrey Hristov
f83e88e3ea
Merge branch 'PHP-5.6'
2014-02-17 18:37:59 +02:00
Andrey Hristov
b2cd56c3cb
Move code out, that handles the actual structure to be used for the decoded
...
data. Will make it easier to add different structures
2014-02-17 18:37:08 +02:00
Dmitry Stogov
f4cfaf36e2
Use better data structures (incomplete)
2014-02-10 10:04:30 +04:00
Andrey Hristov
d9078c7c8d
Merge branch 'PHP-5.6'
2014-01-28 15:47:50 +02:00
Andrey Hristov
c1141d43e9
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-28 15:38:14 +02:00
Andrey Hristov
6b77c3aaa1
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-28 15:33:16 +02:00
Andrey Hristov
79cbcd9ded
add text for the new constants
2014-01-28 15:32:59 +02:00
Andrey Hristov
a87125c1e8
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-28 15:24:45 +02:00
Andrey Hristov
d3faae03ec
add new consts
2014-01-28 15:23:41 +02:00
Andrey Hristov
3aa6f8bfdd
Merge branch 'PHP-5.6'
2014-01-24 12:31:33 +02:00
Andrey Hristov
350b5dddac
WS
2014-01-24 12:31:19 +02:00
Andrey Hristov
dc6b14149d
Merge branch 'PHP-5.6'
...
Conflicts:
ext/mysqlnd/mysqlnd_ps_codec.c
2014-01-24 12:15:03 +02:00
Andrey Hristov
cd2cc7b8f9
Reduce code duplication a bit
2014-01-24 11:52:35 +02:00
Andrey Hristov
0c90c207a7
Backport refactoring from php-src
2014-01-24 11:39:24 +02:00
Andrey Hristov
7072db5a6b
FIx failing tests because of operator precedence
2014-01-23 18:20:13 +02:00
Johannes Schlüter
676864684b
Merge branch 'PHP-5.6'
2014-01-21 16:40:13 +01:00
Johannes Schlüter
4d43e2efdb
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-21 16:38:32 +01:00
