Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V2.6.x fix use local includes #4557

Merged
merged 7 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
use local include - openssl
  • Loading branch information
mirostauder committed May 23, 2024
commit 7695c42534cd3ed44e16e749d44c1caf43c7d181
10 changes: 5 additions & 5 deletions include/proxysql.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
#include <signal.h>
#include <errno.h>
#include <ctype.h>
#include <openssl/bio.h>
#include <openssl/sha.h>
#include <openssl/md5.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
#include "openssl/bio.h"
#include "openssl/sha.h"
#include "openssl/md5.h"
#include "openssl/ssl.h"
#include "openssl/err.h"
#include <poll.h>
#include <execinfo.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/MySQL_Protocol.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <openssl/rand.h>
#include "openssl/rand.h"
#include "proxysql.h"
#include "cpp.h"
#include "re2/re2.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/MySQL_ResultSet.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <openssl/rand.h>
#include "openssl/rand.h"
#include "proxysql.h"
#include "cpp.h"
#include "re2/re2.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/MySQL_encode.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <openssl/rand.h>
#include "openssl/rand.h"
#include "proxysql.h"
#include "cpp.h"

Expand Down
4 changes: 2 additions & 2 deletions lib/ProxySQL_Admin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <unordered_set>
#include <prometheus/exposer.h>
#include <prometheus/counter.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
#include "openssl/ssl.h"
#include "openssl/err.h"
#include "MySQL_HostGroups_Manager.h"
#include "mysql.h"
#include "proxysql_admin.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/mysql_data_stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "MySQL_PreparedStatement.h"
#include "MySQL_Data_Stream.h"

#include <openssl/x509v3.h>
#include "openssl/x509v3.h"


/**
Expand Down
4 changes: 2 additions & 2 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#include "curl/curl.h"

#include <openssl/x509v3.h>
#include "openssl/x509v3.h"

#include <sys/mman.h>

Expand Down Expand Up @@ -71,7 +71,7 @@ char *binary_sha1 = NULL;
#endif

static pthread_mutex_t *lockarray;
#include <openssl/crypto.h>
#include "openssl/crypto.h"


// this fuction will be called as a deatached thread
Expand Down
2 changes: 1 addition & 1 deletion src/proxy_tls.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "proxysql.h"
#include "cpp.h"
#include <openssl/x509v3.h>
#include "openssl/x509v3.h"

static long
get_file_size (const char *filename) {
Expand Down