diff --git a/.gitignore b/.gitignore index 5e6e16e60..b525ea914 100644 --- a/.gitignore +++ b/.gitignore @@ -108,6 +108,10 @@ deps/re2/re2/ deps/pcre/pcre-8.39/ deps/pcre/pcre/ +# curl +deps/curl/curl/ +deps/curl/curl-7.57.0/ + #protobuf deps/protobuf/protobuf-2.6.1/ diff --git a/deps/Makefile b/deps/Makefile index c7164556d..07945dc7b 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -11,12 +11,18 @@ endif PROXYSQLCLICKHOUSE := $(shell echo $(PROXYSQLCLICKHOUSE)) ifeq ($(PROXYSQLCLICKHOUSE),1) -default: libconfig libdaemon jemalloc mariadb_client re2 sqlite3 pcre clickhouse-cpp lz4 cityhash microhttpd +default: libconfig libdaemon jemalloc mariadb_client re2 sqlite3 pcre clickhouse-cpp lz4 cityhash microhttpd curl else -default: libconfig libdaemon jemalloc mariadb_client re2 sqlite3 pcre microhttpd +default: libconfig libdaemon jemalloc mariadb_client re2 sqlite3 pcre microhttpd curl endif .PHONY: default +curl/curl/lib/.libs/libcurl.a: + cd curl && rm -rf curl-7.57.0 || true + cd curl && tar -zxf curl-7.57.0.tar.gz + cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp && CC=${CC} CXX=${CXX} ${MAKE} +curl: curl/curl/lib/.libs/libcurl.a + libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a: cd libmicrohttpd && rm -rf libmicrohttpd-0.9.55 || true cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.55.tar.gz @@ -133,5 +139,6 @@ cleanall: cd clickhouse-cpp/clickhouse-cpp && rm -rf * || true cd lz4 && rm -rf lz4-1.7.5 || true cd libmicrohttpd && rm -rf libmicrohttpd-0.9.55 || true + cd curl && rm -rf curl-7.57.0 || true .PHONY: cleanall diff --git a/deps/curl/COPYING b/deps/curl/COPYING new file mode 100644 index 000000000..1e45a5e2c --- /dev/null +++ b/deps/curl/COPYING @@ -0,0 +1,22 @@ +COPYRIGHT AND PERMISSION NOTICE + +Copyright (c) 1996 - 2017, Daniel Stenberg, , and many +contributors, see the THANKS file. + +All rights reserved. + +Permission to use, copy, modify, and distribute this software for any purpose +with or without fee is hereby granted, provided that the above copyright +notice and this permission notice appear in all copies. + +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 OF THIRD PARTY RIGHTS. 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. + +Except as contained in this notice, the name of a copyright holder shall not +be used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization of the copyright holder. diff --git a/deps/curl/curl b/deps/curl/curl new file mode 120000 index 000000000..95951afdf --- /dev/null +++ b/deps/curl/curl @@ -0,0 +1 @@ +curl-7.57.0 \ No newline at end of file diff --git a/deps/curl/curl-7.57.0.tar.gz b/deps/curl/curl-7.57.0.tar.gz new file mode 100644 index 000000000..dfd980e56 Binary files /dev/null and b/deps/curl/curl-7.57.0.tar.gz differ diff --git a/doc/release_notes/ProxySQL_v1.4.4.md b/doc/release_notes/ProxySQL_v1.4.4.md new file mode 100644 index 000000000..28e37ff79 --- /dev/null +++ b/doc/release_notes/ProxySQL_v1.4.4.md @@ -0,0 +1,17 @@ +## ProxySQL v1.3.3 + +Release date: 2016-12-29 + +Stable release v1.3.3 , released on 2017-01-20 + +Compared to v1.3.2, has the following bugs fixed / enhancements: + +* MySQL Protocol: handle for mysql [bug 66884](https://bugs.mysql.com/bug.php?id=66884) that could cause infinite loop [#873](../../../../issues/873) +* MySQL Protocol: improved SSL connection over slow network, workaround for bug CONC-225 [#883](../../../../issues/833) +* Query routing: in some circumstances `transaction_persistent` could disable routing after commit #889](../../../../issues/889) +* Admin: `Latency_us` was incorrectly named `Latency_ms` [#882](../../../../issues/882) +* Admin: improved scalability on access to `mysql_servers` +* General: improved sypport for systemd +* General: init script returns codes for LSB compliance +* MySQL Protocol: removed assert() for unknown commands, and replaced with an error [#859](../../../../issues/859) +* MySQL Protocol: return an error for `COM_PROCESS_KILL`, deprecated command [#858](../../../../issues/858)