340 Commits

Author SHA1 Message Date
Markus Makela
da987e895a Merge branch 'MXS-212' into develop 2015-06-23 17:11:23 +03:00
Markus Makela
c42d3d9f7a Added missing NULL checks. 2015-06-23 17:05:31 +03:00
counterpoint
09fdb0a2c2 Hopefully final tidy up. 2015-06-23 14:58:53 +01:00
Markus Makela
abf39303d7 Fixed the wrong value being returned form dcb_read_SSL. 2015-06-23 16:20:26 +03:00
Markus Makela
dc43a7d9da Removed unnecessary code from dcb_close and dcb_set_state_nomutex. 2015-06-23 11:25:59 +03:00
counterpoint
b880350cf3 Complete merge of latest develop branch 2015-06-22 10:39:13 +01:00
Markus Makela
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
Martin Brampton
b1c657c2eb Add another debug output; fix bug; clarify variable names. 2015-06-19 20:51:22 +01:00
counterpoint
033080e11e Fix bugs 2015-06-19 15:31:34 +01:00
counterpoint
ef428b9229 Added debug messages for persistent connections; additional information via maxadmin re persistent connections. 2015-06-19 15:01:57 +01:00
Markus Makela
9b0a5f1328 Added more comments. 2015-06-15 16:16:48 +03:00
counterpoint
d6f4699912 Tidy up. 2015-06-15 11:47:18 +01:00
Martin Brampton
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
Markus Makela
f602121459 Added configurable SSL certificate verification depth and updated the documentation in the code. 2015-06-12 21:21:06 +03:00
counterpoint
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
Markus Makela
5936916e04 Merge branch 'develop' into MXS-129 2015-06-12 13:53:41 +03:00
Markus Makela
68d5054afe dcb_alloc now explicitly sets the server and service pointers to NULL. 2015-06-11 21:00:07 +03:00
Markus Makela
1c68a9a872 Fixed dcb_connect_SSL calling SSL_connect again after a successful connection was already made. 2015-06-11 15:54:09 +03:00
Markus Makela
bb427128a9 Fixed successful SSL_accept calls causing another call to SSL_accept. 2015-06-11 12:00:03 +03:00
Martin Brampton
420510749c Fix bug and tidy code. 2015-06-11 09:30:18 +01:00
counterpoint
466e86f057 Remove difftime, add decrement of persistent count when expired or cleaned. 2015-06-10 17:40:00 +01:00
counterpoint
50cc290bc4 Run DCB close separately from spinlocked removal from pool. 2015-06-10 15:43:43 +01:00
counterpoint
267e702dcd Various fixes and code tidying. 2015-06-10 11:28:25 +01:00
Markus Makela
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
Markus Makela
196d41cb88 More debug output. 2015-06-09 20:02:45 +03:00
counterpoint
e9f9e0abe5 Change DCB* to DCB * 2015-06-09 15:39:57 +01:00
Markus Makela
1ad1a31ed7 Fixed the OpenSSL error stack being printed wrong. 2015-06-09 17:18:25 +03:00
counterpoint
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
counterpoint
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
counterpoint
99e9987f9b Clear persistent pool DCBs when server freed. 2015-06-09 08:26:14 +01:00
Markus Makela
06c5da7b17 Minor fix to SSL authentication. 2015-06-09 02:56:55 +03:00
Markus Makela
1c36cfb285 Added more debug output. 2015-06-08 18:04:43 +03:00
Markus Makela
b8e55fe28d Fixed SSL_accept failing when more data was in the socket buffer than was used. 2015-06-07 12:45:08 +03:00
Markus Makela
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
Markus Makela
1989a1482c Fixed empty reads causing a debug assert with large packets. 2015-06-05 19:40:09 +03:00
Markus Makela
61b1f34671 Added more descriptive debug output. 2015-06-05 18:52:44 +03:00
Markus Makela
518ef5050e Fixed debug asserts. 2015-06-05 12:15:19 +03:00
Markus Makela
e83799648a Fixed queries getting stuck when the SSL records were of the maximum allowed size. 2015-06-05 11:00:51 +03:00
Markus Makela
cc1f720ea3 Removed log flushing on every dcb_read_SSL if debug log is enabled. 2015-06-04 21:12:16 +03:00
Markus Makela
ce570685cd Moved assertions around. 2015-06-04 19:31:58 +03:00
Markus Makela
dceccce2ef Changed gwbuf_length function to GWBUF_LENGTH macro in dcb_read_SSL. 2015-06-04 16:52:43 +03:00
counterpoint
e395ab1442 Provide explicit time checking for age of persistent DCBs. 2015-06-03 16:47:02 +01:00
counterpoint
fe2f8e70d1 Add CHK_SERVER capability and test in dcb_persistent_clean_count 2015-06-03 15:39:06 +01:00
counterpoint
ef6b6566e6 Fixes? 2015-06-03 15:08:08 +01:00
Markus Makela
a033cbf200 Added more informative error messages when SSL handshake fails. 2015-06-03 14:14:05 +03:00
counterpoint
cb7eb5848b Fixes, tidying up, etc. 2015-06-03 12:03:00 +01:00
counterpoint
6e803c647b Fix bugs, try different arrangement of dcb_close code. 2015-06-03 10:02:27 +01:00
counterpoint
1a76fc141d Add configuration capabilities for persistent connections. 2015-06-02 15:44:57 +01:00
Markus Makela
a5de4fc503 Merge branch 'develop' into MXS-129 2015-06-02 12:21:05 +03:00
Markus Makela
fc8918b1f2 Added a dcb_connect_SSL function which starts a client SSL connection. 2015-06-02 09:15:08 +03:00