Anatol Belski
1cc536af5a
Revert "Backport patch for bug #71820 "
...
This reverts commit 1b632cfe83
.
This fixed bug #72151 , and reverts the fix for bug #71820 .
See also bug #50636 and #49521 for the history.
2016-05-09 17:15:40 +02:00
Anatol Belski
1b632cfe83
Backport patch for bug #71820
...
Rev b4eedd128b
2016-03-17 14:28:58 +01:00
Lior Kaplan
53fb2f1e5c
Happy new year (Update copyright to 2016)
2016-01-03 01:44:37 +02:00
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Xinchen Hui
fba3985f23
Improve the test
2015-11-17 20:12:50 +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
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
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
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
f79cd18789
Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server
2015-09-23 18:25:12 +02:00
Ferenc Kovacs
faab430141
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
test fixes
2015-04-01 22:08:11 +02:00
Ferenc Kovacs
0a41af216e
test fixes
2015-04-01 22:07:52 +02:00
Xinchen Hui
0584b2df3f
Update NEWS
2015-03-10 15:38:34 +08:00
Xinchen Hui
4ca14f681e
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-09 17:23:04 +08:00
Xinchen Hui
9af1383a3f
Revert "Fix #63486 "
...
This reverts commit f4c96ffcb5
.
2015-03-09 17:22:56 +08:00
Julien Pauli
7684d72df8
Fix #63486
2015-03-08 23:40:55 -07:00
Julien Pauli
f4c96ffcb5
Fix #63486
2015-02-20 13:38:35 +01:00
Keyur Govande
4c6918ec17
Patch commit d9f85373e3
by moving the float_to_double function to
...
a header file.
2015-01-26 21:20:29 +00:00
Keyur Govande
b34f8ef599
Fix for bugs #68114 (Build fails on OS X due to undefined symbols)
...
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).
The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
2015-01-26 21:20:29 +00:00
Keyur Govande
1933b556b9
Patch commit d9f85373e3
by moving the float_to_double function to
...
a header file.
2015-01-26 21:19:00 +00:00
Keyur Govande
e51980f4e6
Fix for bugs #68114 (Build fails on OS X due to undefined symbols)
...
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).
The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
2015-01-26 21:19:00 +00:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Veres Lajos
4dc994571d
typo fixes - https://github.com/vlajos/misspell_fixer
...
Conflicts:
ext/ftp/ftp.h
ext/pcre/pcrelib/pcre_printint.c
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pgsql/pgsql.c
ext/phar/func_interceptors.c
ext/soap/soap.c
ext/standard/image.c
2014-11-23 14:33:43 -08:00
Keyur Govande
032dee4982
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS
Fix another failing test
Add NEWS
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Conflicts:
ext/mysqli/tests/mysqli_change_user.phpt
2014-08-15 23:47:06 +00:00
Keyur Govande
48dc203408
Fix another failing test
2014-08-15 23:26:21 +00:00
Keyur Govande
7c4b5d9187
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add NEWS
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Conflicts:
ext/mysqli/tests/table.inc
2014-08-15 23:13:36 +00:00
Keyur Govande
4e2c01617f
Fix failing tests
2014-08-14 18:20:26 +00:00
Keyur Govande
c044164a96
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
...
Before the patch, a value of 9.99 in a FLOAT column came out of mysqli
as 9.9998998641968. This is because it would naively cast a 4-byte float
into PHP's internal 8-byte double.
To fix this, with GCC we use the built-in decimal support to "up-convert"
the 4-byte float to a 8-byte double.
When that is not available, we fall back to converting the float
to a string and then converting the string to a double. This mimics
what MySQL does.
2014-08-14 18:19:56 +00:00
Andrey Hristov
3dc9bef819
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/fileinfo/data_file.c
ext/fileinfo/libmagic/softmagic.c
ext/fileinfo/magicdata.patch
2014-08-06 16:25:12 +03:00
Andrey Hristov
ce5efa7adc
Merge branch 'PHP-5.4' into PHP-5.5
2014-08-06 15:28:06 +03:00
Andrey Hristov
41e1ccefd5
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
configure.in
main/php_version.h
2014-08-06 15:27:56 +03:00
Andrey Hristov
d72b943262
Add EXPECTF
2014-08-06 15:27:29 +03:00
Andrey Hristov
547451796c
Fix handling of multi-result sets with PS...used to clean not only
...
the result set but the whole PS.
2014-08-06 14:52:12 +03:00
Rasmus Lerdorf
7fe21ce0f3
Merge commit '8b9719d' into PHP-5.6
...
* commit '8b9719d':
We need to turn off any strict mode here for this warning to show up
2014-07-30 12:23:36 -04:00
Rasmus Lerdorf
579c9066a0
Merge commit '8b9719d' into PHP-5.5
...
* commit '8b9719d':
We need to turn off any strict mode here for this warning to show up
2014-07-30 12:23:24 -04:00
Rasmus Lerdorf
8b9719d8b9
We need to turn off any strict mode here for this warning to show up
2014-07-30 12:22:48 -04:00
Andrey Hristov
06f5f65c94
Add some trace info as well as update CLIENT_ flags
2014-07-16 19:24:39 +03:00
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
Andrey Hristov
f201bf2305
Fix another problem with MySQL 5.7
2014-06-18 18:30:37 +03:00
Andrey Hristov
23f77050eb
Merge branch 'PHP-5.5' into PHP-5.6
2014-06-18 16:42:42 +03:00
Andrey Hristov
21c9a9388f
Suppress test failure with MySQL 5.7
2014-06-18 16:20:14 +03: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
Andrey Hristov
1a293e6bd9
rename a constant - old name to new name
2014-05-06 11:36:03 +03:00
Adam Harvey
06a03bbfa6
Fix mysqli build when building against libmysqlclient.
2014-05-02 14:33:52 -07:00