lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2026-01-27 08:02:47 +03:00
Code Activity

Moved ssl_locking_callback to own file

Browse Source
This commit is contained in:
Lammert Bies
2016-12-10 09:58:26 +01:00
parent 8cac8b4ac3
commit 40fe3253be
3 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -69,6 +69,7 @@ LIB_SOURCES = src/libhttp.c \
src/httplib_set_sock_timeout.c \
src/httplib_set_tcp_nodelay.c \
src/httplib_ssl_get_protocol.c \
src/httplib_ssl_locking_callback.c \
src/httplib_ssl_use_pem_file.c \
src/httplib_start.c \
src/httplib_stop.c \

51
src/httplib_ssl_locking_callback.c Normal file
View File

@@ -0,0 +1,51 @@
/*
* Copyright (C) 2016 Lammert Bies
* Copyright (c) 2013-2016 the Civetweb developers
* Copyright (c) 2004-2013 Sergey Lyubka
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "libhttp-private.h"
/*
* void XX_httplib_ssl_locking_callback( int mode, int mutex_num, const char *file, int line );
*
* The function XX_httplib_ssl_locking_callback() is used for locking and
* unlocking mutexes from the SSL routines.
*/
#if !defined(NO_SSL)
void XX_httplib_ssl_locking_callback( int mode, int mutex_num, const char *file, int line ) {
(void)line;
(void)file;
if ( mode & 1 ) pthread_mutex_lock( & XX_httplib_ssl_mutexes[mutex_num] );
else pthread_mutex_unlock( & XX_httplib_ssl_mutexes[mutex_num] );
} /* XX_httplib_ssl_locking_callback */
#endif /* !NO_SSL */

11
src/libhttp.c
View File

@@ -8636,15 +8636,4 @@ void XX_httplib_ssl_get_client_cert_info( struct mg_connection *conn ) {
} /* XX_httplib_ssl_get_client_cert_info */
void XX_httplib_ssl_locking_callback( int mode, int mutex_num, const char *file, int line ) {
(void)line;
(void)file;
if ( mode & 1 ) pthread_mutex_lock( & XX_httplib_ssl_mutexes[mutex_num] );
else pthread_mutex_unlock( & XX_httplib_ssl_mutexes[mutex_num] );
} /* XX_httplib_ssl_locking_callback */
#endif /* !NO_SSL */