Dmitry Stogov
f08a5bfadc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed MarinaDB support
2014-06-20 13:58:26 +04:00
Dmitry Stogov
f0639611cf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed MarinaDB support
2014-06-20 13:57:38 +04:00
Dmitry Stogov
680ddabac1
Fixed MarinaDB support
2014-06-20 13:56:32 +04:00
Xinchen Hui
d632870e4d
Fixed memory leak
2014-06-20 13:27:56 +08:00
Xinchen Hui
73630a1fdc
Fixed pdo_mysql build with mysqlnd
2014-06-19 23:00:45 +08:00
Dmitry Stogov
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
Boro Sitnikovski
cfccdc6362
Bug 64744
...
Show the type of the non-object for more descriptive errors
2014-06-08 19:14:58 -07:00
Xinchen Hui
3a1f79d51d
Fixed bug #47407
2014-05-27 11:48:25 +08:00
Dmitry Stogov
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
Dmitry Stogov
4e521c92ec
Prevent crash in case of SQL error
2014-05-19 11:52:33 +04:00
Dmitry Stogov
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
Xinchen Hui
618de55485
restore unexpected commit
2014-05-13 12:25:03 +08:00
Xinchen Hui
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
Xinchen Hui
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
Xinchen Hui
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
Xinchen Hui
be79628b87
Fixed REFERENCE handling
2014-05-08 16:11:50 +08:00
Xinchen Hui
5f46c8fa31
Fixed bugs in pdo_mysql
2014-05-08 15:19:43 +08:00
Xinchen Hui
dfc940c5d9
Revert "Going to refactor mysqlnd"
...
This reverts commit 37d9f1e6e9
.
2014-05-08 11:50:56 +08:00
Xinchen Hui
37d9f1e6e9
Going to refactor mysqlnd
2014-05-07 23:34:23 +08:00
Xinchen Hui
e3a0809655
Rerevert previous commit to phpt by accident
2014-05-07 17:01:59 +08:00
Xinchen Hui
ed5b6af8af
Refactored filter
2014-05-07 16:52:58 +08:00
Xinchen Hui
478a8b2ebb
Fixed reference handling(param->parameter)
2014-05-07 12:01:07 +08:00
Xinchen Hui
2d0c9690de
Refactor pdo_mysql(incompleted, some tests failed due to no mysqlnd)
2014-05-07 11:00:36 +08:00
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
Timm Friebe
9265077bb0
Adjust expected outcome (non-Zend tests)
2014-04-19 14:09:10 +02:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04: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
Johannes Schlüter
2198bbce86
Merge branch 'PHP-5.4' into PHP-5.5
2014-02-23 14:56:32 +01:00
Johannes Schlüter
756ee95605
We can't dereference dbh if it is NULL
2014-02-23 14:18:24 +01:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Andrey Hristov
9a6b72a05a
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-26 19:15:43 +02:00
Andrey Hristov
0aadab0e2e
add test
2013-11-26 19:15:12 +02:00
Stanislav Malyshev
a2d8ae9a1f
fix mysql tests & mark nextRowset problematic tests
2013-08-24 23:56:48 -07:00
Christopher Jones
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
Rasmus Lerdorf
626d96ab6d
This doesn't fail in 5.5 anymore
2013-08-03 12:14:47 -04:00
Rasmus Lerdorf
d24f31c65e
Merge commit 'd60e168' into PHP-5.5
...
* commit 'd60e168':
pcre_quote? No such thing. How did this ever pass?
2013-08-02 16:13:03 -04:00
Rasmus Lerdorf
d60e168a7a
pcre_quote? No such thing. How did this ever pass?
2013-08-02 16:12:21 -04:00
Rasmus Lerdorf
9ca7910661
Merge commit 'ea75b1b' into PHP-5.5
...
* commit 'ea75b1b':
This test needs local infile enabled
2013-08-02 15:33:40 -04:00
Rasmus Lerdorf
ea75b1b5db
This test needs local infile enabled
2013-08-02 15:33:18 -04:00
Johannes Schlüter
7b92a22772
Fix bug 65299
2013-07-23 14:13:22 +02:00
Johannes Schlüter
5a8b0ca8fa
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-23 12:57:08 +02:00
Johannes Schlüter
c28ab73d73
Fix compiler warning on redefined constant
2013-07-23 12:50:37 +02:00
Johannes Schlüter
e1a0c90b8b
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-16 13:55:32 +02:00
Johannes Schlüter
d3a4af4db8
Make zval2myslqnd implementations aware of inheritance
2013-07-16 13:52:57 +02:00
Anatol Belski
1968fac697
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed mysql tests parsing phpinfo()
Update NEWS
Fixed bug #35703 : when session_name("123") consist only digits, should warning
Fixed bug #49175 : mod_files.sh does not support hash bits
2013-07-02 08:24:37 +02:00
Anatol Belski
743c4864eb
Fixed mysql tests parsing phpinfo()
2013-07-02 08:23:33 +02:00
Stanislav Malyshev
a080611e48
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Tests: PDO Mysql - update for fixed getColumnMeta()
fix bug #48724
2013-06-17 00:42:21 -07:00
Daniel Beardsley
5ac0ee30ce
Tests: PDO Mysql - update for fixed getColumnMeta()
...
The test has always been disabled... so it's never run anyway. Oh well.
2013-06-17 00:41:21 -07:00
Antony Dovgal
95cc763a14
fix bug #48724
...
PDO's getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR
2013-06-17 00:27:21 -07:00
Xinchen Hui
aa2369f85a
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-17 13:23:24 +08:00
Xinchen Hui
cfb1ffb4fa
Fix typo in test
2013-06-17 13:22:20 +08:00
Xinchen Hui
6cd6349ff8
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-16 22:56:22 +08:00
Xinchen Hui
49e57a3165
Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db server)
2013-06-16 22:55:59 +08:00
Andrey Hristov
7503a4b4a4
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-03-13 15:29:40 +01:00
Andrey Hristov
0777a18703
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
NEWS
2013-03-13 14:24:23 +01:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332
Happy New Year~
2013-01-01 16:02:16 +08:00
Remi Collet
6e4cfa18f7
Really fix test pdo_mysql_class_constants.phpt
...
- with mysqlnd, constant always present
- with mysqli, check client library version
- without mysqlnd and without mysqli
skip the test if no connection
use connection to check client library
Note : MySQLPDOTest::getClientVersion() is broken with mysqlnd
as PDO::ATTR_CLIENT_VERSION return "mysqlnd 5.0.11-dev - 20120503..."
so, getClientVersion() return "11"
2012-12-12 16:53:18 +01:00
Remi Collet
784850211e
Reduce case where this test will fails:
...
- no connection AND no mysqli extension
So, will succeed when no configured connection, but mysqli available.
2012-12-03 15:32:52 +01:00
Anatoliy Belsky
f85ae48f4f
Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
...
There is a constant now which only is there when mysqli with
mysqlnd and pdo_mysql was compiled at the same time, or when
libmysql version > 50605. So checking for that dynamically,
will fail only if there is no mysqli and no connection.
2012-11-14 21:18:16 +01:00
Johannes Schlüter
44b1a07d85
Allow setting SHA256 auth public key as option
2012-10-31 16:54:11 +01:00
Johannes Schlüter
d21d909072
Merge branch 'PHP-5.4'
2012-10-26 14:23:22 +02:00
Johannes Schlüter
4f4d77805c
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/pdo_mysql/mysql_statement.c
2012-10-26 14:22:31 +02:00
ULF WENDEL
5d4c691e51
Merge branch 'PHP-5.4'
...
* PHP-5.4:
This won't make the test pass but now its at least one that shows no unnecessary error messages...
2012-10-26 12:32:39 +02:00
ULF WENDEL
056ecf3201
This won't make the test pass but now its at least one that shows no unnecessary error messages...
2012-10-26 12:32:10 +02:00
ULF WENDEL
b8595e1d40
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix for bug #62820
2012-10-23 15:14:45 +02:00
ULF WENDEL
0737be7e7b
Fix for bug #62820
2012-10-23 15:13:57 +02:00
ULF WENDEL
848780606d
Fix for bug #62820 well hidden beneath a ton of whitespace changes. Do not use this pdo factory stuff - you get a line with an error on it, use the mysql stuff in the tests
2012-10-23 14:58:16 +02:00
ULF WENDEL
ccf749e38d
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- BFN
Minor changes for MySQL 5.6
NEWS for 76601c4
2012-09-29 12:21:55 +02:00
ULF WENDEL
13d4d8e2d0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Minor changes for MySQL 5.6
NEWS for 76601c4
Conflicts:
NEWS
2012-09-29 12:17:13 +02:00
Xinchen Hui
69a4301f6c
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:45:07 +08:00
Xinchen Hui
1b9e0de2cc
Remove executable permission on inc
2012-10-10 10:44:34 +08:00
Xinchen Hui
e4a8fa6a15
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e
Fixed bug #63236 (Executable permission on various source files)
2012-10-09 13:28:31 +08:00
ULF WENDEL
20e76f4487
Minor changes for MySQL 5.6
2012-09-29 12:10:24 +02:00
Xinchen Hui
4e5e8c9da0
Merge branch 'PHP-5.4'
2012-10-10 10:45:34 +08:00
Xinchen Hui
75a2c0d715
Merge branch 'PHP-5.4'
2012-10-09 13:30:22 +08:00
Stanislav Malyshev
a3322f8927
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 16:54:03 -07:00
Johannes Schlüter
21cbe30be3
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Remove extra ;
2012-06-22 17:33:38 +02:00
Johannes Schlüter
5e23a047ac
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Remove extra ;
2012-06-22 17:33:22 +02:00
Johannes Schlüter
a62d4e2c43
Remove extra ;
2012-06-22 17:32:46 +02:00
andrey
cd9e4d1def
Merge branch 'PHP-5.4'
2012-05-02 16:15:35 +02:00
andrey
67419499b2
Merge branch 'PHP-5.3' into PHP-5.4
2012-05-02 15:57:08 +02:00
andrey
b42d000471
Fix for bug#61411
...
Bug #61411 PDO Segfaults with PERSISTENT == TRUE && EMULATE_PREPARES == FALSE
Wrong allocation, that doesn't follow the scheme of using stmt->persistent
was the root cause of the problem and the crash at free.
2012-05-02 15:55:22 +02:00
Johannes Schlüter
d2718cb9ff
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Commit generated file
Fix bug #61755 parsing bug can lead to access violations
2012-04-19 12:49:47 +02:00
Johannes Schlüter
0589b19abf
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Commit generated file
Fix bug #61755 parsing bug can lead to access violations
Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails
2012-04-19 12:47:47 +02:00
Johannes Schlüter
1b78aef426
Fix bug #61755 parsing bug can lead to access violations
2012-04-19 12:46:02 +02:00
Pierrick Charron
919085b822
Merge branch 'PHP-5.4'
2012-03-24 18:00:04 -04:00
Pierrick Charron
7f05a39fce
Merge branch 'PHP-5.3' into PHP-5.4
2012-03-24 17:59:46 -04:00
Pierrick Charron
da2da13f93
Remove unused variable
2012-03-24 17:49:58 -04:00
Johannes Schlüter
abd5670566
Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails
2012-03-06 01:43:49 +00:00
Johannes Schlüter
f36cc4f7c8
Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails
2012-03-06 01:43:49 +00:00
Johannes Schlüter
d796ebb0b5
Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails
2012-03-06 01:43:49 +00:00
Johannes Schlüter
dc0070e323
Fix bug #61194 PDO should export compression flag with myslqnd
2012-03-05 23:57:24 +00:00
Johannes Schlüter
048f1fa092
Fix bug #61194 PDO should export compression flag with myslqnd
2012-03-05 23:57:24 +00:00
Johannes Schlüter
46608a073c
Fix bug #61194 PDO should export compression flag with myslqnd
2012-03-05 23:57:24 +00:00