Sammy Kaye Powers
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
Andrey Hristov
f2ab731a8c
Fix emails in headers. @mysql.com addresses are no more since many years.
2016-03-16 10:24:52 +01: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
Andrey Hristov
96406f0842
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-16 12:39:04 +01:00
Andrey Hristov
822400ef3b
News for fixed bug #68344
2015-11-16 12:38:25 +01: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
Dmitry Stogov
c67fc6bb09
Fixed memory leak in php_stream_context_set_option()
2015-10-29 20:06:55 +03: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
7e3cd7cadf
Merge branch 'PHP-5.6' into PHP-7.0
2015-09-25 14:29:06 +02:00
Andrey Hristov
59de2c037c
Fixed bug #70572 segfault in mysqlnd_connect
2015-09-25 14:06:28 +02:00
Christoph M. Becker
71f90dfbad
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70456 : mysqlnd doesn't activate TCP keep-alive when connecting to a server
Resolved conflicts:
ext/mysqlnd/mysqlnd_net.c
2015-09-09 03:19:55 +02:00
Sergei Turchanov
7b3616db77
Fix #70456 : mysqlnd doesn't activate TCP keep-alive when connecting to a server
...
libmysqlclient activates TCP keep-alive when connecting to a server. PHP
mysqlnd extension must do the same to maintain compatibility.
2015-09-09 01:43:29 +02: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
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Anatol Belski
a831bd40d0
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed DBG_INF macro name
reworked NEWS for 5.6.0GA
2014-08-27 12:11:59 +02:00
Anatol Belski
4d667eeaf3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed DBG_INF macro name
2014-08-27 12:11:35 +02:00
Anatol Belski
7fac56e072
fixed DBG_INF macro name
2014-08-27 12:10:35 +02:00
Anatol Belski
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Anatol Belski
bdbf47df18
ported mysql and mysqlnd
2014-08-19 16:51:06 +02:00
Dmitry Stogov
5a06ac88da
cleanup (use zend_string* instead of char*)
2014-08-13 14:51:48 +04:00
Xinchen Hui
110bf9c720
Merge remote-tracking branch 'origin/master' into phpng
...
Conflicts:
Zend/zend_compile.h
ext/openssl/xp_ssl.c
2014-07-18 16:25:43 +08:00
Andrey Hristov
5d6805d498
Merge branch 'PHP-5.6'
...
Conflicts:
NEWS
2014-07-16 19:25:31 +03:00
Andrey Hristov
06f5f65c94
Add some trace info as well as update CLIENT_ flags
2014-07-16 19:24:39 +03:00
Xinchen Hui
64c6b9bd58
typo
2014-06-23 17:10:25 +08:00
Xinchen Hui
c84aff541f
Fixed the trick....
2014-06-23 16:29:48 +08:00
Xinchen Hui
83d450c78d
Fixed segfault of stream handling
2014-06-18 15:03:01 +08:00
Andrey Hristov
5d4f9dfff4
Second set of changes to mysqlnd for phpng.
...
A bit problematic is that the streams seem not to be completely ported.
Also there are some hacks in the streams about EG(regular_list) and EG(persistent_list)
and these need to be carefully checked. The test suite should catch them, however.
2014-05-20 21:50:15 +03:00
Xinchen Hui
0f53e37494
Merge branch 'PHP-5.6'
2014-01-03 11:09:07 +08: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
Kalle Sommer Nielsen
c83598119b
Kill a TSRMLS_FETCH() in php_stream_context_set() by passing TSRMLS_CC to it
...
# For mysqlnd: Relevant PHP_API_VERSION are put in place for cross version compatibility
2013-12-18 09:19:24 +01:00
Stanislav Malyshev
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
Xinchen Hui
cbb5d42b9b
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-06 10:23:21 +08:00
Xinchen Hui
c2f8e90504
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-06 10:20:00 +08:00
Xinchen Hui
bc11e6fdbb
bump year
2013-01-06 10:19:09 +08:00
Andrey Hristov
a0a34f5bca
plug recent leak
2012-10-31 16:13:00 +01:00
Andrey Hristov
d62bc53a4f
cosmetics
2012-10-31 15:54:45 +01:00
Andrey Hristov
4c9e222f99
if ssl has been switched on transmit clear-text password
2012-10-03 14:02:33 +02:00
andrey
263b37bee1
change public key setting to PERDIR and finish code that allows
...
to set the key file programatically per mysqli_options()
2012-09-25 18:26:02 +02:00
andrey
2c230fb574
close the underlying stream as early as possible and so notify the
...
NET layer
2012-06-01 22:12:08 +03:00
