1 files changed, 37 insertions, 53 deletions
diff --git a/net-mgmt/seafile-server/files/patch-server_access-file.c b/net-mgmt/seafile-server/files/patch-server_access-file.c
index 797711a79065..ca439a95cb90 100644
--- a/net-mgmt/seafile-server/files/patch-server_access-file.c
+++ b/net-mgmt/seafile-server/files/patch-server_access-file.c
@@ -1,54 +1,38 @@
---- server/access-file.c.orig	2016-10-09 09:30:49 UTC
+--- server/access-file.c.orig	2018-01-04 08:07:23 UTC
 +++ server/access-file.c
-@@ -224,10 +224,10 @@ write_block_data_cb (struct bufferevent 
-         bev->cbarg = data->saved_cb_arg;
- 
-         /* Resume reading incomming requests. */
--        evhtp_request_resume (data->req);
--
-         evhtp_send_reply_end (data->req);
- 
-+	evhtp_request_resume (data->req);
-+
-         free_sendblock_data (data);
-         return;
-     }
-@@ -309,10 +309,10 @@ next:
-             bev->cbarg = data->saved_cb_arg;
- 
-             /* Resume reading incomming requests. */
--            evhtp_request_resume (data->req);
--
-             evhtp_send_reply_end (data->req);
- 
-+	    evhtp_request_resume (data->req);
-+
-             free_sendfile_data (data);
-             return;
-         }
-@@ -406,10 +406,10 @@ write_dir_data_cb (struct bufferevent *b
-             bev->cbarg = data->saved_cb_arg;
- 
-             /* Resume reading incomming requests. */
--            evhtp_request_resume (data->req);
--
-             evhtp_send_reply_end (data->req);
- 
-+	    evhtp_request_resume (data->req);
-+
-             free_senddir_data (data);
-             return;
-         }
-@@ -697,10 +697,10 @@ finish_file_range_request (struct buffer
-     bev->cbarg = data->saved_cb_arg;
- 
-     /* Resume reading incomming requests. */
--    evhtp_request_resume (data->req);
--
-     evhtp_send_reply_end (data->req);
- 
-+    evhtp_request_resume (data->req);
-+
-     free_send_file_range_data (data);
- }
- 
+@@ -618,7 +618,7 @@ do_file(evhtp_request_t *req, SeafRepo *repo, const ch
+     /* 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 @@ do_file_range (evhtp_request_t *req, SeafRepo *repo, c
+     /* 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);
+@@ -1037,7 +1037,7 @@ start_download_zip_file (evhtp_request_t *req, const c
+     /* 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 @@ do_block(evhtp_request_t *req, SeafRepo *repo, const c
+     /* 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);