Commit Graph

333 Commits

Author SHA1 Message Date
Andrey Hristov
1f7f8429af Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	ext/mysqlnd/mysqlnd.c
2013-01-09 18:40:57 +01:00
Andrey Hristov
bcd278ad7f fix compilation error after merge 2013-01-09 18:39:59 +01:00
Andrey Hristov
cb6071ef54 Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	ext/mysqlnd/mysqlnd.c
2013-01-09 18:30:56 +01:00
Andrey Hristov
6a6ec195ac Merge branch 'PHP-5.3' into PHP-5.4 2013-01-09 18:27:50 +01:00
Andrey Hristov
12e759c2ea Use during connect the flags set with set_client_option() 2013-01-09 18:27:06 +01:00
Andrey Hristov
ddcb67d446 support for password expiration in mysqlnd, through a flag 2013-01-09 15:33:07 +01: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
225792c5db constify 2012-10-12 10:20:09 +02:00
Andrey Hristov
4c9e222f99 if ssl has been switched on transmit clear-text password 2012-10-03 14:02:33 +02:00
Andrey Hristov
c540fe2064 fix login failure with empty password. This is 5.5 specific - new code 2012-09-28 11:58:41 +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
6074df91c6 remove old unicode code, that is was compiled out by using a macro 2012-09-25 16:36:21 +02:00
andrey
571b46bff6 Add SHA256 authentication support - password hashing to mysqlnd
Automatic switchover to SSL with plain-text password is not part of this
2012-09-25 14:04:36 +02:00
andrey
815874c646 plug a leak when the server ask the client for a auth protocol, that
the client doesn't understand. This is 5.5 specific bug, as a result
of a refactoring in 5.5
2012-08-22 20:04:42 +02:00
andrey
049abdfb26 fix valgrind warning 2012-07-09 18:13:35 +03:00
andrey
555db7dc4e fix valgrind warning 2012-07-09 17:59:23 +03:00
andrey
c51fbbe4b4 merge 2012-06-29 16:58:53 +03:00
andrey
ed1f058591 merge 2012-06-29 16:32:55 +03:00
andrey
b7dbcbd41f Merge branch 'PHP-5.3' into PHP-5.4 2012-06-29 14:48:37 +03:00
andrey
8fe87e7fea fix Bug #62273 Segmentation Fault in Mysqli/Mysqlnd 2012-06-29 14:42:36 +03: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
andrey
f96d19fa70 close the stream whenever possible, no need to keep it open altough the
connection is marked as unusable
2012-06-01 11:22:19 +03:00
andrey
0d1bc3e8e5 more refactoring stuff. Reduced code duplication in the authentication
code
2012-05-31 15:46:26 +03:00
andrey
5a2578a333 small refactoring - factour out code from connection establishment.
Add a define for the default authentication protocol - get away from
the hardcoded magic value
2012-05-30 15:24:17 +03:00
andrey
174bf906f8 refactor MYSQLND_NET, split it two parts for easy resharing 2012-04-30 17:01:56 +02:00
Johannes Schlüter
bb2f806534 Fix folding 2012-04-22 02:25:02 +02:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Andrey Hristov
de50e98a07 Add a middleman which can intercept the calls and can reroute them 2011-11-02 17:06:30 +00:00
Andrey Hristov
2627fafcbd - shift a bit of code around
- when cloning use the methods of the original object
2011-11-02 15:08:01 +00:00
Andrey Hristov
989f2fbc14 fix trace log messages 2011-11-02 14:20:35 +00:00
Andrey Hristov
92ec40d8e4 Now really split the method tables and have different
methods for the handle and the data object.
Add auxiliary functions to work with the new methods.
Add possibility to clone a connection object - shadow copy.
2011-10-31 14:33:56 +00:00
Andrey Hristov
8fb6bdd5b8 Split struct MYSQLND in struct MYSQLND and struct MYSQLD_CONN_DATA.
A step in the direction of keeping internal data private
2011-10-31 11:46:24 +00:00
Andrey Hristov
f926a3c07d Move from directly referencing an aggregated structure to using a
pointer to a structure. The structure is still aggregated but we add
a level of indirection for possible plugins to overwrite the storage
2011-10-25 23:01:49 +00:00
Andrey Hristov
3295415cce Add hooks for __call like functionality and also allow to
handle calls that spread over two internal functions. Let's call it
a local TX.
2011-10-25 19:04:36 +00:00
Andrey Hristov
4321da0388 move plugin specific stuff to one file. create object factory
for similar objects
2011-10-24 12:34:44 +00:00
Andrey Hristov
652490d43a shift code around to two new files - mysqlnd_driver.c
and mysqlnd_ext_plugin.c (mysqlnd extension plugin)
2011-10-21 15:28:58 +00:00
Andrey Hristov
efb68d9399 api_ext to reverse_api 2011-10-19 15:04:12 +00:00
Andrey Hristov
5117bf657e move change_user closer to connect 2011-10-18 14:10:44 +00:00
Andrey Hristov
b5f5770399 MYSQLND_NET refactored not to use any direct reference to MYSQLND (the connection)
QC will need an ifdef-layer to compile with this
2011-10-10 20:49:28 +00:00
Johannes Schlüter
a7410ea03d - Fix folding 2011-09-25 13:06:09 +00:00
Johannes Schlüter
223e2ac106 - Fix folding 2011-09-25 13:06:09 +00:00
Pierre Joye
6c2b670e69 - fix build (macros mess) 2011-09-17 12:41:23 +00:00
Pierre Joye
a68abe830d - fix TS build 2011-09-17 10:24:18 +00:00
Dmitry Stogov
d6ab6bc6ea Fixed Windows build 2011-09-16 06:55:43 +00:00
Johannes Schlüter
f90bead78a - Fix TSRM build 2011-09-01 12:04:54 +00:00
Johannes Schlüter
7d25510b1b - Register extensions using mysqlnd (mysql, myslqi, pdo_mysql) with mysqlnd 2011-08-31 20:30:08 +00:00
Andrey Hristov
9756f766b6 fix valgrind warnings in debug builds 2011-08-26 12:14:31 +00:00