Commit Graph

425 Commits

Author SHA1 Message Date
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
1c68a9a872 Fixed dcb_connect_SSL calling SSL_connect again after a successful connection was already made. 2015-06-11 15:54:09 +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
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
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
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
dceccce2ef Changed gwbuf_length function to GWBUF_LENGTH macro in dcb_read_SSL. 2015-06-04 16:52:43 +03:00
e395ab1442 Provide explicit time checking for age of persistent DCBs. 2015-06-03 16:47:02 +01:00
fe2f8e70d1 Add CHK_SERVER capability and test in dcb_persistent_clean_count 2015-06-03 15:39:06 +01:00
ef6b6566e6 Fixes? 2015-06-03 15:08:08 +01:00
a033cbf200 Added more informative error messages when SSL handshake fails. 2015-06-03 14:14:05 +03:00
cb7eb5848b Fixes, tidying up, etc. 2015-06-03 12:03:00 +01:00
6e803c647b Fix bugs, try different arrangement of dcb_close code. 2015-06-03 10:02:27 +01:00
1a76fc141d Add configuration capabilities for persistent connections. 2015-06-02 15:44:57 +01:00
a5de4fc503 Merge branch 'develop' into MXS-129 2015-06-02 12:21:05 +03:00
fc8918b1f2 Added a dcb_connect_SSL function which starts a client SSL connection. 2015-06-02 09:15:08 +03:00
d7232d8b6e Moved SSL structure to the DCB instead of the MySQL protocol.
This allows for non-MySQL SSL connections.
2015-06-01 20:51:26 +03:00
739ea82e36 Clean up modifications. 2015-06-01 14:05:31 +01:00
a2768955e7 SSL handshake now successfully completes when a client connects with SSL enabled. 2015-06-01 13:50:22 +03:00
0f814d3e73 Added SSL write and read functions. 2015-05-29 13:00:37 +03:00
e5b4984a12 Fix bugs. 2015-05-27 16:56:53 +01:00
23e9a7b4e2 Try out some more changes. 2015-05-27 16:41:06 +01:00
6c5e6a5959 Move code around to fix headers problem etc. 2015-05-27 10:17:35 +01:00
351f52b8e1 Add "show persistent {server}" 2015-05-27 09:57:18 +01:00
8964e76f84 Improve messages 2015-05-26 17:03:13 +01:00
d90ea82aaa Try different code, continue polling while not in use. 2015-05-26 16:31:52 +01:00
44fc324329 Fix bugs 2015-05-26 14:59:26 +01:00
fccb9df817 Add more status information to maxadmin displays 2015-05-26 14:54:32 +01:00
9d1b48da57 Move persistent from dcb_close to dcb_add_to_zombieslist 2015-05-26 11:25:10 +01:00
d7cd40e5a5 Bug fixes and improvements. 2015-05-22 15:53:54 +01:00
b51c5f52ef Fix problems in knowing user for persistent connections. 2015-05-22 14:23:14 +01:00