Commit Graph

1229 Commits

Author SHA1 Message Date
c22c6ea46a ServiceStop only removed DCBs from the polling system
This removes the need to establish new DCBs for each of the listeners while still blocking new session creation
for a service which is shut down. The client will not receive an error and the connection will be accepted
when the service is restarted.
2015-06-23 09:15:06 +03:00
2d9c9425c5 Merge branch 'binlog_router_mariadb10' into dev-mdb10
Conflicts:
	server/core/config.c
2015-06-22 19:16:38 +03:00
b880350cf3 Complete merge of latest develop branch 2015-06-22 10:39:13 +01:00
e14b29baf9 Fix to MXS-212: https://mariadb.atlassian.net/browse/MXS-212
The listener DCB is now properly closed instead of just being removed from the poll set.
2015-06-21 12:51:54 +03:00
4c38e2224b Merge remote-tracking branch 'origin/develop' into MXS-122
Conflicts:
	server/core/CMakeLists.txt
	server/core/dcb.c
	server/include/dcb.h
	server/include/server.h
	server/modules/protocol/mysql_backend.c
2015-06-19 23:12:54 +01:00
b1c657c2eb Add another debug output; fix bug; clarify variable names. 2015-06-19 20:51:22 +01:00
033080e11e Fix bugs 2015-06-19 15:31:34 +01:00
ef428b9229 Added debug messages for persistent connections; additional information via maxadmin re persistent connections. 2015-06-19 15:01:57 +01:00
acd649cdc4 Reverted back to older OpenSSL functions for compatibility support. 2015-06-17 18:18:40 +03:00
4417f2bbf4 Moved atomic to its own static library. 2015-06-17 16:50:15 +03:00
425dd8cb3b Removed SSLv2 methods from serviceInitSSL because OpenSSL 1.1.0 does not support them. 2015-06-17 10:24:02 +03:00
466ee46d82 Fix to MXS-125: https://mariadb.atlassian.net/browse/MXS-125
Unified the usages of maxkeys and maxpasswd.
2015-06-16 17:10:00 +03:00
97a06e4006 Updated function documentation. 2015-06-16 14:24:38 +03:00
9b0a5f1328 Added more comments. 2015-06-15 16:16:48 +03:00
d6f4699912 Tidy up. 2015-06-15 11:47:18 +01:00
84d5af1e00 Throw away poll events that occur for persistent pool DCBs with no related session; fix typos. 2015-06-14 18:19:30 +01:00
f602121459 Added configurable SSL certificate verification depth and updated the documentation in the code. 2015-06-12 21:21:06 +03:00
dc21ef0165 Fix problem with persisting DCBs that have been closed by backend; try leaving persistent DCBs polling. 2015-06-12 15:27:53 +01:00
5936916e04 Merge branch 'develop' into MXS-129 2015-06-12 13:53:41 +03:00
68d5054afe dcb_alloc now explicitly sets the server and service pointers to NULL. 2015-06-11 21:00:07 +03:00
f24da8712b Fixed a segfault and disabled syslog by default. 2015-06-11 18:25:42 +03:00
1c68a9a872 Fixed dcb_connect_SSL calling SSL_connect again after a successful connection was already made. 2015-06-11 15:54:09 +03:00
3f34d237ca enabled all bug fixes for OpenSSL. 2015-06-11 15:26:05 +03:00
2cf92a1894 Added RSA key generator. 2015-06-11 13:22:18 +03:00
bb427128a9 Fixed successful SSL_accept calls causing another call to SSL_accept. 2015-06-11 12:00:03 +03:00
420510749c Fix bug and tidy code. 2015-06-11 09:30:18 +01:00
03470bcd70 Merge branch 'develop' into MXS-129 2015-06-11 10:29:57 +03:00
466e86f057 Remove difftime, add decrement of persistent count when expired or cleaned. 2015-06-10 17:40:00 +01:00
50cc290bc4 Run DCB close separately from spinlocked removal from pool. 2015-06-10 15:43:43 +01:00
267e702dcd Various fixes and code tidying. 2015-06-10 11:28:25 +01:00
de2910f75b Fixed SSL_accept failing if the GWBUF with the initial MySQL auth packet contains some of the SSL authentication data. 2015-06-09 22:27:15 +03:00
196d41cb88 More debug output. 2015-06-09 20:02:45 +03:00
1275a594ac Added missing utils library link from testmodutils. 2015-06-09 18:44:19 +03:00
e9f9e0abe5 Change DCB* to DCB * 2015-06-09 15:39:57 +01:00
1ad1a31ed7 Fixed the OpenSSL error stack being printed wrong. 2015-06-09 17:18:25 +03:00
ab120cb1de Added Diffie-Hellman key exchange for MaxScale. 2015-06-09 17:04:51 +03:00
152f9bbc4a Merge remote-tracking branch 'origin/develop' into MXS-122 2015-06-09 13:51:55 +01:00
393e25e953 Fix bug in dcb; rearrange mysql_backend gw_backend_close to cope with receiving DCB that is no longer linked to a session. 2015-06-09 12:03:58 +01:00
d0e92a15f8 Move decrement of server connections into zombie processing; introduce dcb_close_finish to be called either in dcb_close or when persistent dcb is discarded. 2015-06-09 11:41:43 +01:00
99e9987f9b Clear persistent pool DCBs when server freed. 2015-06-09 08:26:14 +01:00
06c5da7b17 Minor fix to SSL authentication. 2015-06-09 02:56:55 +03:00
1c36cfb285 Added more debug output. 2015-06-08 18:04:43 +03:00
b8e55fe28d Fixed SSL_accept failing when more data was in the socket buffer than was used. 2015-06-07 12:45:08 +03:00
d19ccc6f84 Fixed SSL_ERROR_WANT_READ, SSL_ERROR_WANT_WRITE and SSL_ERROR_NONE causing a debug assert. 2015-06-05 20:36:04 +03:00
1989a1482c Fixed empty reads causing a debug assert with large packets. 2015-06-05 19:40:09 +03:00
61b1f34671 Added more descriptive debug output. 2015-06-05 18:52:44 +03:00
518ef5050e Fixed debug asserts. 2015-06-05 12:15:19 +03:00
e83799648a Fixed queries getting stuck when the SSL records were of the maximum allowed size. 2015-06-05 11:00:51 +03:00
cc1f720ea3 Removed log flushing on every dcb_read_SSL if debug log is enabled. 2015-06-04 21:12:16 +03:00
ce570685cd Moved assertions around. 2015-06-04 19:31:58 +03:00