cherokee at cherokee-project
Jul 3, 2009, 1:17 AM
Views: 96
Permalink
|
|
[3419] cherokee/trunk/cherokee: Fixes a compilation problem ( when building with TLS-SNI support):
|
|
Revision: 3419
http://svn.cherokee-project.com/changeset/3419
Author: alo
Date: 2009-07-03 10:17:02 +0200 (Fri, 03 Jul 2009)
Log Message:
-----------
Fixes a compilation problem (when building with TLS-SNI support):
http://lists.octality.com/pipermail/cherokee/2009-July/010668.html
Modified Paths:
--------------
cherokee/trunk/cherokee/cryptor_libssl.c
cherokee/trunk/cherokee/vrule_target_ip.c
Modified: cherokee/trunk/cherokee/cryptor_libssl.c
===================================================================
--- cherokee/trunk/cherokee/cryptor_libssl.c 2009-07-03 08:06:15 UTC (rev 3418)
+++ cherokee/trunk/cherokee/cryptor_libssl.c 2009-07-03 08:17:02 UTC (rev 3419)
@@ -201,7 +201,7 @@
*/
cherokee_buffer_fake (&tmp, servername, strlen(servername));
- ret = cherokee_server_get_vserver (srv, &tmp, &vsrv);
+ ret = cherokee_server_get_vserver (srv, &tmp, &vsrv, NULL);
if ((ret != ret_ok) || (vsrv == NULL)) {
LOG_ERROR ("Servername did not match: '%s'\n", servername);
return SSL_TLSEXT_ERR_NOACK;
Modified: cherokee/trunk/cherokee/vrule_target_ip.c
===================================================================
--- cherokee/trunk/cherokee/vrule_target_ip.c 2009-07-03 08:06:15 UTC (rev 3418)
+++ cherokee/trunk/cherokee/vrule_target_ip.c 2009-07-03 08:17:02 UTC (rev 3419)
@@ -43,6 +43,13 @@
ret_t ret;
cherokee_socket_t sock;
+ /* There might not be a connection
+ */
+ if (conn == NULL)
+ return ret_deny;
+
+ /* Use a temporal socket object
+ */
ret = cherokee_socket_init (&sock);
if (unlikely(ret != ret_ok))
return ret_error;
@@ -67,6 +74,7 @@
goto deny;
}
+ cherokee_socket_mrproper (&sock);
TRACE(ENTRIES, "Rule from matched %s", "\n");
return ret_ok;
deny:
|
[3419] cherokee/trunk/cherokee: Fixes a compilation problem ( when building with TLS-SNI support):