d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
39c3207896
Revert previous commit by mistake
2014-09-04 11:59:58 +08:00
e90ec235dc
Use PHP_GINIT to suppress incompatible pointer type
2014-09-04 11:56:13 +08:00
af59e92b24
master renames phase 7
2014-08-25 21:51:49 +02:00
28b7a03318
master renamings phase 5
2014-08-25 21:20:44 +02:00
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
eb1871b3fb
yet trivial fixes to mysql exts
2014-08-21 09:54:40 +02:00
4ed156d4df
ported from pdo - pgsql, odbc, mysql, firebirt, dblib
2014-08-19 19:02:07 +02:00
63d3f0b844
basic macro replacements, all at once
2014-08-19 08:07:31 +02:00
da3aeeed39
clean up - avoid realloc
2014-08-13 15:51:43 +08:00
8ce23d8f4f
Don't use zend_string for other fields (only name here is enough)
2014-06-25 00:42:20 +08:00
92a7089893
Use zend_string in mysqlnd
2014-06-23 19:27:24 +08:00
c135ca0a9d
Actually, I don't know how it works. (maybe I should re-start again :<)
2014-06-23 15:35:53 +08:00
629c9d3eda
Merge branch 'master' into phpng
...
* master:
Fixed MarinaDB support
2014-06-20 14:02:15 +04:00
f08a5bfadc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed MarinaDB support
2014-06-20 13:58:26 +04:00
f0639611cf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed MarinaDB support
2014-06-20 13:57:38 +04:00
680ddabac1
Fixed MarinaDB support
2014-06-20 13:56:32 +04:00
d632870e4d
Fixed memory leak
2014-06-20 13:27:56 +08:00
73630a1fdc
Fixed pdo_mysql build with mysqlnd
2014-06-19 23:00:45 +08:00
dd1c68e67f
Merge branch 'master' into phpng
...
* master: (77 commits)
NEWS entry for Fix potential segfault in dns_get_record()
NEWS entry for "Fix potential segfault in dns_get_record()"
NEWS entry for Fix potential segfault in dns_get_record(
Fix potential segfault in dns_get_record()
Revert "Add optional second arg to unserialize()"
5.5.15 now
update NEWS
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
Fix broken test.
Add a mime type map generation script and update the header.
Move the mime type map out of php_cli_server.c for easier generation.
Replace the CLI server's linear search for extensions with a hash table.
fix test
Remove unused included file
NEWS
NEWS
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
...
Conflicts:
Zend/zend_closures.c
Zend/zend_execute.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/spl/spl_array.c
ext/standard/basic_functions.c
ext/standard/dns.c
ext/standard/var.c
2014-06-12 05:07:33 +04:00
cfccdc6362
Bug 64744
...
Show the type of the non-object for more descriptive errors
2014-06-08 19:14:58 -07:00
3a1f79d51d
Fixed bug #47407
2014-05-27 11:48:25 +08:00
b38bb265d4
Fixed test. The warning actually indicate a problem in master that we didn't repeat in phpng.
2014-05-19 22:20:02 +04:00
4e521c92ec
Prevent crash in case of SQL error
2014-05-19 11:52:33 +04:00
c25f09e6ab
Reverted wrong commit
...
Xinchen, stop commit changed configs :)
You may use environment variables to ovverride default settings
2014-05-13 21:29:57 +04:00
618de55485
restore unexpected commit
2014-05-13 12:25:03 +08:00
7541f93f97
ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while building with libmysql
2014-05-08 18:34:56 +08:00
28e6a2b452
Revert "ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while building with libmysql"
...
This reverts commit 29b3529292
2014-05-08 18:34:40 +08:00
29b3529292
ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while building with libmysql
2014-05-08 18:30:21 +08:00
be79628b87
Fixed REFERENCE handling
2014-05-08 16:11:50 +08:00
5f46c8fa31
Fixed bugs in pdo_mysql
2014-05-08 15:19:43 +08:00
dfc940c5d9
Revert "Going to refactor mysqlnd"
...
This reverts commit 37d9f1e6e9
2014-05-08 11:50:56 +08:00
37d9f1e6e9
Going to refactor mysqlnd
2014-05-07 23:34:23 +08:00
e3a0809655
Rerevert previous commit to phpt by accident
2014-05-07 17:01:59 +08:00
ed5b6af8af
Refactored filter
2014-05-07 16:52:58 +08:00
478a8b2ebb
Fixed reference handling(param->parameter)
2014-05-07 12:01:07 +08:00
2d0c9690de
Refactor pdo_mysql(incompleted, some tests failed due to no mysqlnd)
2014-05-07 11:00:36 +08:00
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
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
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
2198bbce86
Merge branch 'PHP-5.4' into PHP-5.5
2014-02-23 14:56:32 +01:00
756ee95605
We can't dereference dbh if it is NULL
2014-02-23 14:18:24 +01:00
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
9a6b72a05a
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-26 19:15:43 +02:00
0aadab0e2e
add test
2013-11-26 19:15:12 +02:00
a2d8ae9a1f
fix mysql tests & mark nextRowset problematic tests
2013-08-24 23:56:48 -07:00
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
626d96ab6d
This doesn't fail in 5.5 anymore
2013-08-03 12:14:47 -04:00
Johannes Schlüter