ad7e1768aa
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #71820 pg_fetch_object bind parameters before call constructor
2016-03-17 12:49:34 +01:00
b4eedd128b
Fixed bug #71820 pg_fetch_object bind parameters before call constructor
...
If we want to fetch into an object of a custom class that implemens
__set handler, the corstructor has to be called first. The data
passed to the constructor can be possibly required in __set handler.
2016-03-17 12:41:55 +01:00
3a33ee63e8
Merge branch 'PHP-7.0'
2016-03-16 10:47:27 +01:00
f2ab731a8c
Fix emails in headers. @mysql.com addresses are no more since many years.
2016-03-16 10:24:52 +01:00
f57c0b3249
Merge branch 'PHP-7.0'
2016-03-03 16:50:47 +01:00
1ac152938c
Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
...
Also re bug #71575 .
2016-03-03 16:50:01 +01:00
c67c166f93
Removed zend_fcall_info.symbol_table
2016-03-02 17:50:55 +03:00
93dc91b386
Remove version checks
...
PHP_VERSION_ID
PHP_API_VERSION
ZEND_MODULE_API_NO
PHP_MAJOR_VERSION, PHP_MINOR_VERSION
ZEND_ENGINE_2
I've left litespeed alone, as it seems to genuinely maintain support
for many PHP versions.
2016-01-30 15:35:28 +01:00
2eb4728611
Remove HAVE_SPL checks
...
SPL is always built.
Also clean up spl_ce_RuntimeException handling in PDO.
2016-01-30 14:53:00 +01:00
928d2cb3a4
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Happy new year (Update copyright to 2016)
2016-01-04 18:14:08 +01:00
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
a19173e4af
- Make functions static, as they are not needed to be public - exported
...
through a structure
- Fixed typo in statistic name
- Added 2 static functions for copying a MYSQLND_CSTRING and converting
a CSTRING to STRING.
2016-01-04 16:48:35 +01:00
53fb2f1e5c
Happy new year (Update copyright to 2016)
2016-01-03 01:44:37 +02:00
3d5438bf7b
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Update header to PHP Version 7
Happy new year (Update copyright to 2016)
Happy new year (Update copyright to 2016)
2016-01-01 20:04:31 +02:00
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
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
3aa2182db6
Merge branch 'PHP-7.0'
2015-11-27 15:53:19 +08:00
a347b0be48
Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors)
2015-11-27 15:52:55 +08:00
03d5fdc1b8
Merge branch 'PHP-7.0'
2015-11-17 20:14:22 +08:00
4f0a05ab3e
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-17 20:14:11 +08:00
fba3985f23
Improve the test
2015-11-17 20:12:50 +08:00
5bdc5f4e2b
Merge branch 'PHP-7.0'
2015-11-16 17:59:54 +08:00
9134f9e98f
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/mysql/php_mysql.c
2015-11-16 17:59:46 +08:00
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
0a7e08d385
MNDR:
...
- cleanup in mysqlnd_result.c
- switch from zend_ulong to size_t for lengths. Accordingly change
mysqli and pdo_mysql for this.
2015-11-12 16:19:16 +01:00
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
2b23ba97f3
Fix mysqli tests
2015-10-28 12:56:12 +01:00
c133515811
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-27 13:32:45 +01:00
3dc0bf7428
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-22 11:50:12 +02:00
afd31489d0
Improve fix for Bug #68344 MySQLi does not provide way to disable peer certificate validation
2015-10-22 11:48:53 +02:00
8f9b2b68ee
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-21 15:52:38 +02:00
8292260515
Fix for Bug #68344 MySQLi does not provide way to disable peer certificate validation
2015-10-21 15:10:24 +02:00
efd2b3f5f2
Update the certificates needed for the mysqli tests
2015-10-21 10:42:51 +02:00
d160e98feb
fix test
2015-10-12 09:46:52 +02:00
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
3e74df74f9
fix test
2015-09-30 12:18:32 +02:00
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
7b787ebbb6
Merge branch 'PHP-5.6' into PHP-7.0
2015-09-30 09:04:00 +02:00
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
003b764a49
Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server
2015-09-23 18:38:29 +02:00
f79cd18789
Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server
2015-09-23 18:25:12 +02:00
927d68db24
Avoid reallocations
2015-09-14 23:04:27 +03:00
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
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
a6b47e8d68
Merge branch 'zval_dump_consistent' of https://github.com/laruence/php-src
2015-07-30 13:14:38 +08:00
4e66cce87c
switch to the unified globals accessor where appropriate
2015-07-29 13:26:35 +02:00
c55c7ef0ec
Make debug_val_dump and var_dump prints int and float the same
2015-07-23 12:14:34 +08:00
1c7619491e
Fix failing tests from exception code changes
2015-07-07 23:14:05 -05:00
ed1b64877d
Switch position of ce in exception ce variable names
2015-07-03 09:45:03 -05:00
a812a74c2e
Change zend_exception_get_default() to zend_exception_ce
2015-07-03 09:44:48 -05:00
Anatol Belski