libevhtp: update to 1.2.18, add oniguruma package, adapt seafile-serverlilik-openwrt-22.03
@ -0,0 +1,29 @@ | |||||
--- a/evhtp.c | |||||
+++ b/evhtp.c | |||||
@@ -2863,7 +2863,7 @@ htp__accept_cb_(struct evconnlistener * serv, int fd, struct sockaddr * s, int s | |||||
} /* htp__accept_cb_ */ | |||||
#ifndef EVHTP_DISABLE_SSL | |||||
-#ifndef EVHTP_DISABLE_EVTHR | |||||
+#if !defined(EVHTP_DISABLE_EVTHR) && (OPENSSL_VERSION_NUMBER < 0x10100000L) | |||||
#ifndef WIN32 | |||||
#define _HTP_tid (unsigned long)pthread_self() | |||||
@@ -4575,7 +4575,7 @@ htp__use_threads_(evhtp_t * htp, | |||||
htp->thread_init_cb = init_cb; | |||||
htp->thread_exit_cb = exit_cb; | |||||
-#ifndef EVHTP_DISABLE_SSL | |||||
+#if !defined(EVHTP_DISABLE_EVTHR) && (OPENSSL_VERSION_NUMBER < 0x10100000L) | |||||
evhtp_ssl_use_threads(); | |||||
#endif | |||||
@@ -4723,7 +4723,7 @@ evhtp_set_post_accept_cb(evhtp_t * htp, evhtp_post_accept_cb cb, void * arg) | |||||
} | |||||
#ifndef EVHTP_DISABLE_SSL | |||||
-#ifndef EVHTP_DISABLE_EVTHR | |||||
+#if !defined(EVHTP_DISABLE_EVTHR) && (OPENSSL_VERSION_NUMBER < 0x10100000L) | |||||
int | |||||
evhtp_ssl_use_threads(void) | |||||
{ |
@ -1,49 +0,0 @@ | |||||
diff -rupN libevhtp-1.2.9.orig/htparse/htparse.c libevhtp-1.2.9/htparse/htparse.c | |||||
--- libevhtp-1.2.9.orig/htparse/htparse.c 2014-03-23 12:50:50.000000000 +0100 | |||||
+++ libevhtp-1.2.9/htparse/htparse.c 2014-12-09 01:12:22.242001241 +0100 | |||||
@@ -197,6 +197,7 @@ static const char * method_strmap[] = { | |||||
#define _MIN_READ(a, b) ((a) < (b) ? (a) : (b)) | |||||
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ | |||||
#define _str3_cmp(m, c0, c1, c2, c3) \ | |||||
*(uint32_t *)m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0) | |||||
@@ -226,6 +227,37 @@ static const char * method_strmap[] = { | |||||
*(uint32_t *)m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0) \ | |||||
&& ((uint32_t *)m)[1] == ((c7 << 24) | (c6 << 16) | (c5 << 8) | c4) \ | |||||
&& m[8] == c8 | |||||
+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ | |||||
+#define _str3_cmp(m, c0, c1, c2, c3) \ | |||||
+ *(uint32_t *)m == ((c0 << 24) | (c1 << 16) | (c2 << 8) | c3) | |||||
+ | |||||
+#define _str3Ocmp(m, c0, c1, c2, c3) \ | |||||
+ *(uint32_t *)m == ((c0 << 24) | (c1 << 16) | (c2 << 8) | c3) | |||||
+ | |||||
+#define _str4cmp(m, c0, c1, c2, c3) \ | |||||
+ *(uint32_t *)m == ((c0 << 24) | (c1 << 16) | (c2 << 8) | c3) | |||||
+ | |||||
+#define _str5cmp(m, c0, c1, c2, c3, c4) \ | |||||
+ *(uint32_t *)m == ((c0 << 24) | (c1 << 16) | (c2 << 8) | c3) \ | |||||
+ && m[4] == c4 | |||||
+ | |||||
+#define _str6cmp(m, c0, c1, c2, c3, c4, c5) \ | |||||
+ *(uint32_t *)m == ((c0 << 24) | (c1 << 16) | (c2 << 8) | c3) \ | |||||
+ && (((uint32_t *)m)[1] & 0xffff0000) == ((c4 << 24) | c5 << 16) | |||||
+ | |||||
+#define _str7_cmp(m, c0, c1, c2, c3, c4, c5, c6, c7) \ | |||||
+ *(uint32_t *)m == ((c0 << 24) | (c1 << 16) | (c2 << 8) | c3) \ | |||||
+ && ((uint32_t *)m)[1] == ((c4 << 24) | (c5 << 16) | (c6 << 8) | c7) | |||||
+ | |||||
+#define _str8cmp(m, c0, c1, c2, c3, c4, c5, c6, c7) \ | |||||
+ *(uint32_t *)m == ((c0 << 24) | (c1 << 16) | (c2 << 8) | c3) \ | |||||
+ && ((uint32_t *)m)[1] == ((c4 << 24) | (c5 << 16) | (c6 << 8) | c7) | |||||
+ | |||||
+#define _str9cmp(m, c0, c1, c2, c3, c4, c5, c6, c7, c8) \ | |||||
+ *(uint32_t *)m == ((c0 << 24) | (c1 << 16) | (c2 << 8) | c3) \ | |||||
+ && ((uint32_t *)m)[1] == ((c4 << 24) | (c5 << 16) | (c6 << 8) | c7) \ | |||||
+ && m[8] == c8 | |||||
+#endif | |||||
#define __HTPARSE_GENHOOK(__n) \ | |||||
static inline int hook_ ## __n ## _run(htparser * p, htparse_hooks * hooks) { \ |
@ -1,132 +0,0 @@ | |||||
--- a/evhtp.c | |||||
+++ b/evhtp.c | |||||
@@ -1817,16 +1817,15 @@ _evhtp_ssl_thread_lock(int mode, int typ | |||||
#endif | |||||
static void | |||||
_evhtp_ssl_delete_scache_ent(evhtp_ssl_ctx_t * ctx, evhtp_ssl_sess_t * sess) { | |||||
- evhtp_t * htp; | |||||
- evhtp_ssl_cfg_t * cfg; | |||||
- unsigned char * sid; | |||||
- unsigned int slen; | |||||
+ evhtp_t * htp; | |||||
+ evhtp_ssl_cfg_t * cfg; | |||||
+ evhtp_ssl_data_t * sid; | |||||
+ unsigned int slen; | |||||
htp = (evhtp_t *)SSL_CTX_get_app_data(ctx); | |||||
cfg = htp->ssl_cfg; | |||||
- sid = sess->session_id; | |||||
- slen = sess->session_id_length; | |||||
+ sid = (evhtp_ssl_data_t *)SSL_SESSION_get_id(sess, &slen); | |||||
if (cfg->scache_del) { | |||||
(cfg->scache_del)(htp, sid, slen); | |||||
@@ -1837,14 +1836,17 @@ static int | |||||
_evhtp_ssl_add_scache_ent(evhtp_ssl_t * ssl, evhtp_ssl_sess_t * sess) { | |||||
evhtp_connection_t * connection; | |||||
evhtp_ssl_cfg_t * cfg; | |||||
- unsigned char * sid; | |||||
+ evhtp_ssl_data_t * sid; | |||||
int slen; | |||||
connection = (evhtp_connection_t *)SSL_get_app_data(ssl); | |||||
- cfg = connection->htp->ssl_cfg; | |||||
+ if (connection->htp == NULL) | |||||
+ { | |||||
+ return 0; /* We cannot get the ssl_cfg */ | |||||
+ } | |||||
- sid = sess->session_id; | |||||
- slen = sess->session_id_length; | |||||
+ cfg = connection->htp->ssl_cfg; | |||||
+ sid = (evhtp_ssl_data_t *)SSL_SESSION_get_id(sess, &slen); | |||||
SSL_set_timeout(sess, cfg->scache_timeout); | |||||
@@ -1856,7 +1858,7 @@ _evhtp_ssl_add_scache_ent(evhtp_ssl_t * | |||||
} | |||||
static evhtp_ssl_sess_t * | |||||
-_evhtp_ssl_get_scache_ent(evhtp_ssl_t * ssl, unsigned char * sid, int sid_len, int * copy) { | |||||
+_evhtp_ssl_get_scache_ent(evhtp_ssl_t * ssl, evhtp_ssl_data_t * sid, int sid_len, int * copy) { | |||||
evhtp_connection_t * connection; | |||||
evhtp_ssl_cfg_t * cfg; | |||||
evhtp_ssl_sess_t * sess; | |||||
@@ -1898,12 +1900,12 @@ _evhtp_ssl_servername(evhtp_ssl_t * ssl, | |||||
connection->vhost_via_sni = 1; | |||||
SSL_set_SSL_CTX(ssl, evhtp_vhost->ssl_ctx); | |||||
- SSL_set_options(ssl, SSL_CTX_get_options(ssl->ctx)); | |||||
+ SSL_set_options(ssl, SSL_CTX_get_options(SSL_get_SSL_CTX(ssl))); | |||||
if ((SSL_get_verify_mode(ssl) == SSL_VERIFY_NONE) || | |||||
(SSL_num_renegotiations(ssl) == 0)) { | |||||
- SSL_set_verify(ssl, SSL_CTX_get_verify_mode(ssl->ctx), | |||||
- SSL_CTX_get_verify_callback(ssl->ctx)); | |||||
+ SSL_set_verify(ssl, SSL_CTX_get_verify_mode(SSL_get_SSL_CTX(ssl)), | |||||
+ SSL_CTX_get_verify_callback(SSL_get_SSL_CTX(ssl))); | |||||
} | |||||
return SSL_TLSEXT_ERR_OK; | |||||
@@ -3197,15 +3199,21 @@ evhtp_ssl_init(evhtp_t * htp, evhtp_ssl_ | |||||
return -1; | |||||
} | |||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L | |||||
SSL_library_init(); | |||||
SSL_load_error_strings(); | |||||
+#endif | |||||
RAND_poll(); | |||||
STACK_OF(SSL_COMP) * comp_methods = SSL_COMP_get_compression_methods(); | |||||
sk_SSL_COMP_zero(comp_methods); | |||||
htp->ssl_cfg = cfg; | |||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L | |||||
htp->ssl_ctx = SSL_CTX_new(SSLv23_server_method()); | |||||
+#else | |||||
+ htp->ssl_ctx = SSL_CTX_new(TLS_server_method()); | |||||
+#endif | |||||
#if OPENSSL_VERSION_NUMBER >= 0x10000000L | |||||
SSL_CTX_set_options(htp->ssl_ctx, SSL_MODE_RELEASE_BUFFERS); | |||||
@@ -3242,7 +3250,11 @@ evhtp_ssl_init(evhtp_t * htp, evhtp_ssl_ | |||||
SSL_CTX_set_verify(htp->ssl_ctx, cfg->verify_peer, cfg->x509_verify_cb); | |||||
if (cfg->x509_chk_issued_cb != NULL) { | |||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L | |||||
htp->ssl_ctx->cert_store->check_issued = cfg->x509_chk_issued_cb; | |||||
+#else | |||||
+ X509_STORE_set_check_issued(SSL_CTX_get_cert_store(htp->ssl_ctx), cfg->x509_chk_issued_cb); | |||||
+#endif | |||||
} | |||||
if (cfg->verify_depth) { | |||||
--- a/evhtp.h | |||||
+++ b/evhtp.h | |||||
@@ -34,6 +34,11 @@ typedef SSL evhtp_ | |||||
typedef SSL_CTX evhtp_ssl_ctx_t; | |||||
typedef X509 evhtp_x509_t; | |||||
typedef X509_STORE_CTX evhtp_x509_store_ctx_t; | |||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L | |||||
+typedef unsigned char evhtp_ssl_data_t; | |||||
+#else | |||||
+typedef const unsigned char evhtp_ssl_data_t; | |||||
+#endif | |||||
#else | |||||
typedef void evhtp_ssl_sess_t; | |||||
typedef void evhtp_ssl_t; | |||||
@@ -157,9 +162,9 @@ typedef int (*evhtp_headers_iterator)(ev | |||||
typedef int (*evhtp_ssl_verify_cb)(int pre_verify, evhtp_x509_store_ctx_t * ctx); | |||||
typedef int (*evhtp_ssl_chk_issued_cb)(evhtp_x509_store_ctx_t * ctx, evhtp_x509_t * x, evhtp_x509_t * issuer); | |||||
-typedef int (*evhtp_ssl_scache_add)(evhtp_connection_t * connection, unsigned char * sid, int sid_len, evhtp_ssl_sess_t * sess); | |||||
-typedef void (*evhtp_ssl_scache_del)(evhtp_t * htp, unsigned char * sid, int sid_len); | |||||
-typedef evhtp_ssl_sess_t * (*evhtp_ssl_scache_get)(evhtp_connection_t * connection, unsigned char * sid, int sid_len); | |||||
+typedef int (*evhtp_ssl_scache_add)(evhtp_connection_t * connection, evhtp_ssl_data_t * sid, int sid_len, evhtp_ssl_sess_t * sess); | |||||
+typedef void (*evhtp_ssl_scache_del)(evhtp_t * htp, evhtp_ssl_data_t * sid, int sid_len); | |||||
+typedef evhtp_ssl_sess_t * (*evhtp_ssl_scache_get)(evhtp_connection_t * connection, evhtp_ssl_data_t * sid, int sid_len); | |||||
typedef void * (*evhtp_ssl_scache_init)(evhtp_t *); | |||||
#define EVHTP_VERSION "1.2.0" |
@ -1,45 +0,0 @@ | |||||
--- a/evhtp.c | |||||
+++ b/evhtp.c | |||||
@@ -1797,10 +1797,10 @@ _evhtp_accept_cb(evserv_t * serv, int fd, struct sockaddr * s, int sl, void * ar | |||||
} | |||||
#ifndef EVHTP_DISABLE_SSL | |||||
-#ifndef EVHTP_DISABLE_EVTHR | |||||
-static unsigned long | |||||
-_evhtp_ssl_get_thread_id(void) { | |||||
- return (unsigned long)pthread_self(); | |||||
+#if !defined(EVHTP_DISABLE_EVTHR) && (OPENSSL_VERSION_NUMBER < 0x10100000L) | |||||
+static void | |||||
+_evhtp_ssl_get_thread_id(CRYPTO_THREADID *id) { | |||||
+ CRYPTO_THREADID_set_numeric(id, (unsigned long)pthread_self()); | |||||
} | |||||
static void | |||||
@@ -3050,7 +3050,9 @@ evhtp_use_threads(evhtp_t * htp, evhtp_thread_init_cb init_cb, int nthreads, voi | |||||
htp->thread_init_cbarg = arg; | |||||
#ifndef EVHTP_DISABLE_SSL | |||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L | |||||
evhtp_ssl_use_threads(); | |||||
+#endif | |||||
#endif | |||||
if (!(htp->thr_pool = evthr_pool_new(nthreads, _evhtp_thread_init, htp))) { | |||||
@@ -3161,7 +3163,7 @@ evhtp_set_post_accept_cb(evhtp_t * htp, evhtp_post_accept_cb cb, void * arg) { | |||||
} | |||||
#ifndef EVHTP_DISABLE_SSL | |||||
-#ifndef EVHTP_DISABLE_EVTHR | |||||
+#if !defined(EVHTP_DISABLE_EVTHR) && (OPENSSL_VERSION_NUMBER < 0x10100000L) | |||||
int | |||||
evhtp_ssl_use_threads(void) { | |||||
int i; | |||||
@@ -3179,7 +3181,7 @@ evhtp_ssl_use_threads(void) { | |||||
pthread_mutex_init(&(ssl_locks[i]), NULL); | |||||
} | |||||
- CRYPTO_set_id_callback(_evhtp_ssl_get_thread_id); | |||||
+ CRYPTO_THREADID_set_callback(_evhtp_ssl_get_thread_id); | |||||
CRYPTO_set_locking_callback(_evhtp_ssl_thread_lock); | |||||
return 0; |
@ -1,12 +0,0 @@ | |||||
--- a/test_proxy.c | |||||
+++ b/test_proxy.c | |||||
@@ -5,6 +5,9 @@ | |||||
#include <errno.h> | |||||
#include <evhtp.h> | |||||
+#ifndef SIGTERM | |||||
+#define SIGTERM 15 | |||||
+#endif | |||||
int | |||||
make_request(evbase_t * evbase, |
@ -1,7 +0,0 @@ | |||||
--- a/CMakeLists.txt | |||||
+++ b/CMakeLists.txt | |||||
@@ -241,3 +241,4 @@ endif() | |||||
install (FILES evhtp.h DESTINATION include) | |||||
install (FILES htparse/htparse.h DESTINATION include) | |||||
install (FILES evthr/evthr.h DESTINATION include) | |||||
+install (FILES oniguruma/onigposix.h DESTINATION include) |
@ -0,0 +1,54 @@ | |||||
# This is free software, licensed under the GNU General Public License v2. | |||||
# See /LICENSE for more information. | |||||
# | |||||
include $(TOPDIR)/rules.mk | |||||
PKG_NAME:=oniguruma | |||||
PKG_VERSION:=6.9.2 | |||||
PKG_RELEASE:=1 | |||||
PKG_SOURCE:=onig-$(PKG_VERSION).tar.gz | |||||
PKG_SOURCE_URL:=https://codeload.github.com/kkos/oniguruma/tar.gz/v$(PKG_VERSION)? | |||||
PKG_HASH:=3b568a9050839e7828b2f2d5bc9cd3650979b6b54a080f54c515320dddda06b0 | |||||
PKG_MAINTAINER:=Eneas U de Queiroz <cote2004-github@yahoo.com.br> | |||||
PKG_LICENSE:=BSD-2-Clause | |||||
PKG_LICENSE_FILES:=COPYING | |||||
PKG_CPE_ID:=cpe:/a:oniguruma_project:oniguruma | |||||
PKG_INSTALL:=1 | |||||
PKG_FIXUP:=autoreconf | |||||
include $(INCLUDE_DIR)/package.mk | |||||
define Package/oniguruma | |||||
SECTION:=libs | |||||
CATEGORY:=Libraries | |||||
TITLE:=Regular expression library for different character encodings | |||||
URL:=https://github.com/kkos/oniguruma | |||||
DEPENDS:= | |||||
ABI_VERSION:=5 | |||||
endef | |||||
define Package/oniguruma/description | |||||
Oniguruma is a modern and flexible regular expressions library. | |||||
It encompasses features from different regular expression implementations that | |||||
traditionally exist in different languages. | |||||
Character encoding can be specified per regular expression object. | |||||
endef | |||||
define Package/oniguruma/install | |||||
$(INSTALL_DIR) $(1)/usr/lib | |||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libonig.so.$(ABI_VERSION) $(1)/usr/lib/ | |||||
endef | |||||
define Build/InstallDev | |||||
$(INSTALL_DIR) $(1)/usr/{include,lib} | |||||
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ | |||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ | |||||
$(SED) 's,/usr,${STAGING_DIR}/usr,g' $(1)/usr/lib/pkgconfig/oniguruma.pc | |||||
endef | |||||
$(eval $(call BuildPackage,oniguruma)) |
@ -0,0 +1,40 @@ | |||||
Author: David Barbion <davidb@230ruedubac.fr> | |||||
Description: Use shared object for libevhtp | |||||
Forwarded: https://github.com/haiwen/seafile-server/pull/12 | |||||
Index: seafile-server/configure.ac | |||||
=================================================================== | |||||
--- seafile-server.orig/configure.ac | |||||
+++ seafile-server/configure.ac | |||||
@@ -218,6 +218,10 @@ PKG_CHECK_MODULES(LIBEVENT, [libevent >= | |||||
AC_SUBST(LIBEVENT_CFLAGS) | |||||
AC_SUBST(LIBEVENT_LIBS) | |||||
+PKG_CHECK_MODULES(LIBEVHTP, [evhtp]) | |||||
+AC_SUBST(LIBEVHTP_CFLAGS) | |||||
+AC_SUBST(LIBEVHTP_LIBS) | |||||
+ | |||||
PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_REQUIRED]) | |||||
AC_SUBST(ZLIB_CFLAGS) | |||||
AC_SUBST(ZLIB_LIBS) | |||||
Index: seafile-server/server/Makefile.am | |||||
=================================================================== | |||||
--- seafile-server.orig/server/Makefile.am | |||||
+++ seafile-server/server/Makefile.am | |||||
@@ -13,6 +13,7 @@ AM_CFLAGS = -DPKGDATADIR=\"$(pkgdatadir) | |||||
@GLIB2_CFLAGS@ \ | |||||
@MSVC_CFLAGS@ \ | |||||
@LIBARCHIVE_CFLAGS@ \ | |||||
+ @LIBEVHTP_CFLAGS@ \ | |||||
-Wall | |||||
bin_PROGRAMS = seaf-server | |||||
@@ -114,7 +115,7 @@ seaf_server_SOURCES = \ | |||||
seaf_server_LDADD = @CCNET_LIBS@ \ | |||||
$(top_builddir)/lib/libseafile_common.la \ | |||||
- @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ -levhtp \ | |||||
+ -lonig @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ @LIBEVHTP_LIBS@ \ | |||||
$(top_builddir)/common/cdc/libcdc.la \ | |||||
$(top_builddir)/common/db-wrapper/libdbwrapper.la \ | |||||
@SEARPC_LIBS@ @JANSSON_LIBS@ ${LIB_WS32} @ZLIB_LIBS@ \ |
@ -0,0 +1,69 @@ | |||||
Author: Alexandre Rossi <alexandre.rossi@gmail.com> | |||||
Description: Fix download stalling on recent libevhtp | |||||
A while ago[1], evhtp_request_pause() behavior changed: it now disables | |||||
both read and write events. seafile-server would then stall. | |||||
. | |||||
[1] https://github.com/criticalstack/libevhtp/commit/6cd89466fd6bd76c5b8624be65af5893afe3e40c | |||||
[2] https://github.com/haiwen/seafile/issues/1119 | |||||
Forwarded: no | |||||
Index: seafile-server/server/access-file.c | |||||
=================================================================== | |||||
--- seafile-server.orig/server/access-file.c 2018-02-01 12:23:53.209308343 +0100 | |||||
+++ seafile-server/server/access-file.c 2018-02-01 12:23:53.205308288 +0100 | |||||
@@ -618,7 +618,7 @@ | |||||
/* Block any new request from this connection before finish | |||||
* handling this request. | |||||
*/ | |||||
- evhtp_request_pause (req); | |||||
+ bufferevent_disable(bev, EV_READ); | |||||
/* Kick start data transfer by sending out http headers. */ | |||||
evhtp_send_reply_start(req, EVHTP_RES_OK); | |||||
@@ -967,7 +967,7 @@ | |||||
/* Block any new request from this connection before finish | |||||
* handling this request. | |||||
*/ | |||||
- evhtp_request_pause (req); | |||||
+ bufferevent_disable(bev, EV_READ); | |||||
/* Kick start data transfer by sending out http headers. */ | |||||
evhtp_send_reply_start(req, EVHTP_RES_PARTIAL); | |||||
@@ -1032,7 +1032,7 @@ | |||||
/* Block any new request from this connection before finish | |||||
* handling this request. | |||||
*/ | |||||
- evhtp_request_pause (req); | |||||
+ bufferevent_disable(bev, EV_READ); | |||||
/* Kick start data transfer by sending out http headers. */ | |||||
evhtp_send_reply_start(req, EVHTP_RES_OK); | |||||
@@ -1365,7 +1365,7 @@ | |||||
/* Block any new request from this connection before finish | |||||
* handling this request. | |||||
*/ | |||||
- evhtp_request_pause (req); | |||||
+ bufferevent_disable(bev, EV_READ); | |||||
/* Kick start data transfer by sending out http headers. */ | |||||
evhtp_send_reply_start(req, EVHTP_RES_OK); | |||||
Index: seafile-server/server/upload-file.c | |||||
=================================================================== | |||||
--- seafile-server.orig/server/upload-file.c 2018-02-01 12:23:53.209308343 +0100 | |||||
+++ seafile-server/server/upload-file.c 2018-02-01 12:25:14.542400155 +0100 | |||||
@@ -2054,6 +2054,7 @@ | |||||
if (res != EVHTP_RES_OK) { | |||||
/* Don't receive any data before the connection is closed. */ | |||||
//evhtp_request_pause (req); | |||||
+ // or for later evhtp bufferevent_disable(evhtp_request_get_bev(req), EV_READ); | |||||
/* Set keepalive to 0. This will cause evhtp to close the | |||||
* connection after sending the reply. | |||||
@@ -2271,6 +2272,7 @@ | |||||
err: | |||||
/* Don't receive any data before the connection is closed. */ | |||||
//evhtp_request_pause (req); | |||||
+ // or for later evhtp bufferevent_disable(evhtp_request_get_bev(req), EV_READ); | |||||
/* Set keepalive to 0. This will cause evhtp to close the | |||||
* connection after sending the reply. |
@ -0,0 +1,85 @@ | |||||
Author: Alexandre Rossi <alexandre.rossi@gmail.com> | |||||
Description: Take into account libevhtp API changes | |||||
Forwarded: no | |||||
Index: seafile-server/server/upload-file.c | |||||
=================================================================== | |||||
--- seafile-server.orig/server/upload-file.c 2018-02-01 12:25:52.666911934 +0100 | |||||
+++ seafile-server/server/upload-file.c 2018-02-01 12:27:37.812323399 +0100 | |||||
@@ -2059,7 +2059,7 @@ | |||||
/* Set keepalive to 0. This will cause evhtp to close the | |||||
* connection after sending the reply. | |||||
*/ | |||||
- req->keepalive = 0; | |||||
+ req->flags &= ~EVHTP_REQ_FLAG_KEEPALIVE; | |||||
fsm->state = RECV_ERROR; | |||||
} | |||||
@@ -2260,8 +2260,8 @@ | |||||
} | |||||
/* Set up per-request hooks, so that we can read file data piece by piece. */ | |||||
- evhtp_set_hook (&req->hooks, evhtp_hook_on_read, upload_read_cb, fsm); | |||||
- evhtp_set_hook (&req->hooks, evhtp_hook_on_request_fini, upload_finish_cb, fsm); | |||||
+ evhtp_request_set_hook (req, evhtp_hook_on_read, upload_read_cb, fsm); | |||||
+ evhtp_request_set_hook (req, evhtp_hook_on_request_fini, upload_finish_cb, fsm); | |||||
/* Set arg for upload_cb or update_cb. */ | |||||
req->cbarg = fsm; | |||||
@@ -2277,7 +2277,7 @@ | |||||
/* Set keepalive to 0. This will cause evhtp to close the | |||||
* connection after sending the reply. | |||||
*/ | |||||
- req->keepalive = 0; | |||||
+ req->flags &= ~EVHTP_REQ_FLAG_KEEPALIVE; | |||||
send_error_reply (req, EVHTP_RES_BADREQ, err_msg); | |||||
g_free (repo_id); | |||||
@@ -2346,38 +2346,32 @@ | |||||
cb = evhtp_set_regex_cb (htp, "^/upload/.*", upload_cb, NULL); | |||||
/* upload_headers_cb() will be called after evhtp parsed all http headers. */ | |||||
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
cb = evhtp_set_regex_cb (htp, "^/upload-api/.*", upload_api_cb, NULL); | |||||
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
cb = evhtp_set_regex_cb (htp, "^/upload-raw-blks-api/.*", | |||||
upload_raw_blks_api_cb, NULL); | |||||
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
cb = evhtp_set_regex_cb (htp, "^/upload-blks-api/.*", upload_blks_api_cb, NULL); | |||||
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
- | |||||
- /* cb = evhtp_set_regex_cb (htp, "^/upload-blks-aj/.*", upload_blks_ajax_cb, NULL); */ | |||||
- /* evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); */ | |||||
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
cb = evhtp_set_regex_cb (htp, "^/upload-aj/.*", upload_ajax_cb, NULL); | |||||
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
cb = evhtp_set_regex_cb (htp, "^/update/.*", update_cb, NULL); | |||||
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
cb = evhtp_set_regex_cb (htp, "^/update-api/.*", update_api_cb, NULL); | |||||
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
cb = evhtp_set_regex_cb (htp, "^/update-blks-api/.*", update_blks_api_cb, NULL); | |||||
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
- | |||||
- /* cb = evhtp_set_regex_cb (htp, "^/update-blks-aj/.*", update_blks_ajax_cb, NULL); */ | |||||
- /* evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); */ | |||||
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
cb = evhtp_set_regex_cb (htp, "^/update-aj/.*", update_ajax_cb, NULL); | |||||
- evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
+ evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL); | |||||
evhtp_set_regex_cb (htp, "^/upload_progress.*", upload_progress_cb, NULL); | |||||