Julien Pauli
736b91c650
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
Conflicts:
ext/json/php_json_encoder.h
sapi/continuity/capi.c
2016-01-04 18:13:38 +01:00
Lior Kaplan
53fb2f1e5c
Happy new year (Update copyright to 2016)
2016-01-03 01:44:37 +02:00
Lior Kaplan
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Xinchen Hui
a347b0be48
Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors)
2015-11-27 15:52:55 +08:00
Xinchen Hui
4f0a05ab3e
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-17 20:14:11 +08:00
Xinchen Hui
fba3985f23
Improve the test
2015-11-17 20:12:50 +08:00
Xinchen Hui
9134f9e98f
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/mysql/php_mysql.c
2015-11-16 17:59:46 +08:00
Xinchen Hui
be6fd4ba89
Fixed bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction)
...
Actually, this only be fixed if php uses mysqlnd
2015-11-16 16:59:55 +08:00
Andrey Hristov
6d51b7b2e3
Another Fix for Bug #68344 MySQLi does not provide way to disable peer certificate validation
...
Added the possibility to explicitly state that the peer certificate should not be checked.
Back to the default - checking the certificate.
Exported MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT
Usage : mysqli_real_connect( , , , , , MYSQLI_CLIENT_SSL | MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT)
If mysqli_ssl_set() is not called, but only MYSQLI_CLIENT_SSL is passed, without the (don't) very flag,
then no verification takes place.
2015-10-27 12:59:09 +01:00
Andrey Hristov
2b23ba97f3
Fix mysqli tests
2015-10-28 12:56:12 +01:00
Andrey Hristov
c133515811
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-27 13:32:45 +01:00
Andrey Hristov
3dc0bf7428
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-22 11:50:12 +02:00
Andrey Hristov
afd31489d0
Improve fix for Bug #68344 MySQLi does not provide way to disable peer certificate validation
2015-10-22 11:48:53 +02:00
Andrey Hristov
8f9b2b68ee
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-21 15:52:38 +02:00
Andrey Hristov
8292260515
Fix for Bug #68344 MySQLi does not provide way to disable peer certificate validation
2015-10-21 15:10:24 +02:00
Andrey Hristov
efd2b3f5f2
Update the certificates needed for the mysqli tests
2015-10-21 10:42:51 +02:00
Anatol Belski
d160e98feb
fix test
2015-10-12 09:46:52 +02:00
Dmitry Stogov
5d2813edce
Fixed test.
...
MySQL and MariaDB of different versions have different assumptions about TIMESTAMP attributes.
Probably we need to add yet another condition to also check MariaDB version.
2015-10-07 14:09:37 +03:00
Anatol Belski
3e74df74f9
fix test
2015-09-30 12:18:32 +02:00
Andrey Hristov
07a8e5ce37
Add JSON as exported type, if available. mysqlnd has it, libmysql doesn't export it (for now).
2015-09-30 09:03:35 +02:00
Andrey Hristov
7b787ebbb6
Merge branch 'PHP-5.6' into PHP-7.0
2015-09-30 09:04:00 +02:00
Dmitry Stogov
ad4fa8f758
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-24 22:39:59 +03:00
Andrey Hristov
003b764a49
Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server
2015-09-23 18:38:29 +02:00
Andrey Hristov
f79cd18789
Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server
2015-09-23 18:25:12 +02:00
Dmitry Stogov
927d68db24
Avoid reallocations
2015-09-14 23:04:27 +03:00
Christoph M. Becker
b15eff6386
Fix #32490 : constructor of mysqli has wrong name
...
As of PHP 7 old style constructor names are deprecated, so we rename
mysqli::mysqli() to mysqli::__construct().
2015-09-01 21:44:16 +02:00
Christoph M. Becker
2455ab2a2b
Remove superfluous forward declaration
...
mysqli_get_cache_stats() has been removed with commit f9ad56e; we're finally
getting rid of its remaining forward declaration.
2015-08-25 14:26:55 +02:00
Xinchen Hui
a6b47e8d68
Merge branch 'zval_dump_consistent' of https://github.com/laruence/php-src
2015-07-30 13:14:38 +08:00
Anatol Belski
4e66cce87c
switch to the unified globals accessor where appropriate
2015-07-29 13:26:35 +02:00
Xinchen Hui
c55c7ef0ec
Make debug_val_dump and var_dump prints int and float the same
2015-07-23 12:14:34 +08:00
Aaron Piotrowski
1c7619491e
Fix failing tests from exception code changes
2015-07-07 23:14:05 -05:00
Aaron Piotrowski
ed1b64877d
Switch position of ce in exception ce variable names
2015-07-03 09:45:03 -05:00
Aaron Piotrowski
a812a74c2e
Change zend_exception_get_default() to zend_exception_ce
2015-07-03 09:44:48 -05:00
Dmitry Stogov
068f63ceb2
Fixed broken name
2015-07-01 18:23:06 +03:00
Dmitry Stogov
2ea3258ed5
Cleanup (updated comments)
2015-07-01 17:32:04 +03:00
Dmitry Stogov
819fd30cb3
Cleanup (replce hack by a clean implementation)
2015-07-01 17:30:00 +03:00
Dmitry Stogov
26e8329d0d
Cleanup (removed dead code)
2015-07-01 17:07:57 +03:00
Dmitry Stogov
c34651e8f8
Cleanup (avoid duplication)
2015-07-01 17:01:42 +03:00
Dmitry Stogov
7aa7627172
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 13:59:27 +03:00
Dmitry Stogov
4a2e40bb86
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 04:05:24 +03:00
Rasmus Lerdorf
28d7bb97a1
Fix more proto comments
2015-06-23 17:46:20 -04:00
Kalle Sommer Nielsen
db22946b25
Remove these old references to the DSP files we don't use anymore
2015-06-22 13:29:42 +02:00
Aaron Piotrowski
110e0a5a2c
Merge branch 'master' into throwable-interface
...
# Conflicts:
# Zend/zend_language_scanner.c
# Zend/zend_language_scanner.l
# ext/simplexml/tests/SimpleXMLElement_xpath.phpt
2015-06-14 18:53:11 -05:00
Nikita Popov
5d3cf577aa
Make convert_to_* safe with rc>1
...
This only involves switching zval_dtor to zval_ptr_dtor for arrays
and making the convert_to_object for arrays a bit more generic.
All the other changes outside zend_operators.c just make use of
this new ability (use COPY instead of DUP).
What's still missing: Proper references handling. I've seen many
convert_to* calls that will break when a reference is used.
Also fixes bug #69788 .
2015-06-11 23:23:57 +02:00
Aaron Piotrowski
e97d5fab35
Update exception names in tests after formatting changes.
2015-05-17 17:31:43 -05:00
Aaron Piotrowski
fb7206e452
Merge branch 'master' into throwable-interface
2015-05-17 16:15:35 -05:00
Nikita Popov
3ae995f03c
Tweak uncaught exception message display
...
This implements a reduced variant of #1226 with just the following
change:
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d
+Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d
The '' wrapper around messages is very weird if the exception
message itself contains ''. Futhermore having the message wrapped
in '' doesn't work for the "and defined" suffix of
TypeExceptions.
2015-05-17 18:47:06 +02:00
Aaron Piotrowski
64b167d201
Updated tests to reflect exception class changes.
2015-05-16 16:49:14 -05:00
Nikita Popov
c9f27ee422
Display EngineExceptions like ordinary exceptions
...
TypeException stays as-is for now because it uses messages that are
incompatible with the way exception messages are displayed.
closure_038.phpt and a few others now show that we're generating
too many exceptions for compound operations on undefined properties
-- this needs to be fixed in a followup.
2015-05-15 23:40:32 +02:00