diff mbox

[OpenWrt-Devel,packages] lighttpd: backport a fix for running out of filedescriptors

Message ID 1439497407-15562-1-git-send-email-zajec5@gmail.com
State Rejected
Headers show

Commit Message

Rafał Miłecki Aug. 13, 2015, 8:23 p.m. UTC
It was breaking uploads of files 4 MiB+. This patch fixes:
https://github.com/openwrt/packages/issues/1658

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
This should be applied to both: master and 15.05 branch.
---
 ...filedescriptors-when-uploading-large-file.patch | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 net/lighttpd/patches/001-fix-out-of-filedescriptors-when-uploading-large-file.patch

Comments

Rafał Miłecki Aug. 16, 2015, 12:44 a.m. UTC | #1
On 13 August 2015 at 22:23, Rafał Miłecki <zajec5@gmail.com> wrote:
> It was breaking uploads of files 4 MiB+. This patch fixes:
> https://github.com/openwrt/packages/issues/1658
>
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> ---
> This should be applied to both: master and 15.05 branch.

Can you push this?
Rafał Miłecki Aug. 19, 2015, 4:40 p.m. UTC | #2
On 16 August 2015 at 02:44, Rafał Miłecki <zajec5@gmail.com> wrote:
> On 13 August 2015 at 22:23, Rafał Miłecki <zajec5@gmail.com> wrote:
>> It was breaking uploads of files 4 MiB+. This patch fixes:
>> https://github.com/openwrt/packages/issues/1658
>>
>> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
>> ---
>> This should be applied to both: master and 15.05 branch.
>
> Can you push this?

I've pushed this fix on my own.

Michael: I hope you're OK and you can still maintain this package in the future.
W. Michael Petullo Aug. 19, 2015, 5:17 p.m. UTC | #3
>>> This should be applied to both: master and 15.05 branch.

>> Can you push this?

> I've pushed this fix on my own.
> 
> Michael: I hope you're OK and you can still maintain this package in the future.

Thank you, Rafał. My workload did not allow me to get to this in time.
diff mbox

Patch

diff --git a/net/lighttpd/patches/001-fix-out-of-filedescriptors-when-uploading-large-file.patch b/net/lighttpd/patches/001-fix-out-of-filedescriptors-when-uploading-large-file.patch
new file mode 100644
index 0000000..6ef9403
--- /dev/null
+++ b/net/lighttpd/patches/001-fix-out-of-filedescriptors-when-uploading-large-file.patch
@@ -0,0 +1,26 @@ 
+From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbuehler@web.de>
+Date: Thu, 13 Aug 2015 18:44:27 +0000
+Subject: [PATCH] fix out-of-filedescriptors when uploading "large" files
+ (fixes #2660, thx rmilecki)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Stefan Bühler <stbuehler@web.de>
+
+git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@3009 152afb58-edef-0310-8abb-c4023f1b3aa9
+---
+ src/chunk.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/chunk.c
++++ b/src/chunk.c
+@@ -432,7 +432,7 @@ static int chunkqueue_append_to_tempfile
+ 	 * */
+ 
+ 	if (NULL != dest->last
+-		&& FILE_CHUNK != dest->last->type
++		&& FILE_CHUNK == dest->last->type
+ 		&& dest->last->file.is_temp
+ 		&& -1 != dest->last->file.fd
+ 		&& 0 == dest->last->offset) {