aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2018-07-28 20:13:26 +0000
committerTed Trask <ttrask01@yahoo.com>2018-08-08 19:09:06 +0000
commit7fd9036fc1ce8c14360349533133b4df0e9806b0 (patch)
tree7ecb7bb739b2f77ea8702d913978c879cdb6c6ef
parent70bbeef9560773077c355e9816977d9ab61c15c6 (diff)
downloadaports-7fd9036fc1ce8c14360349533133b4df0e9806b0.tar.gz
aports-7fd9036fc1ce8c14360349533133b4df0e9806b0.tar.bz2
aports-7fd9036fc1ce8c14360349533133b4df0e9806b0.tar.xz
main/mini_httpd: Fix cgi bug breaking ACF logon
(cherry picked from commit 22b198e7f8bbdf04f28682bf286a89921d4c3a44)
-rw-r--r--main/mini_httpd/APKBUILD6
-rw-r--r--main/mini_httpd/cgi.patch11
2 files changed, 15 insertions, 2 deletions
diff --git a/main/mini_httpd/APKBUILD b/main/mini_httpd/APKBUILD
index beb539042d..f4873d0b50 100644
--- a/main/mini_httpd/APKBUILD
+++ b/main/mini_httpd/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mini_httpd
pkgver=1.29
-pkgrel=0
+pkgrel=1
pkgdesc="Small forking webserver with ssl and ipv6 support"
url="http://www.acme.com/software/mini_httpd/"
arch="all"
@@ -17,6 +17,7 @@ source="http://www.acme.com/software/$pkgname/$pkgname-$pkgver.tar.gz
$pkgname.conf
$pkgname.initd
$pkgname.logrotate
+ cgi.patch
"
builddir="$srcdir/$pkgname-$pkgver"
@@ -56,4 +57,5 @@ package() {
sha512sums="ad72dab7b501c6cc364aac0f8ebd6e967a9150b366f03d2bedb8c7a0001610b9eb55a839cd1c92aad4e9c55a32b3b962cd5a841ac3f159a033457f92a6d1b568 mini_httpd-1.29.tar.gz
1e6ef2da61c82ff5e8bb79058c188954d72c69e9d25abdd9bca51f3122aac8729bcfd6e53ae7ee40807b9250698f2cde13dad51ffed962aa07004c7f456f9cb3 mini_httpd.conf
9daa9052609136a461c912ee2b64829abf2c4c626553a12a3d45c2158be4ed0749126b5ea594fed02a6a4779d7869a073070c259ac28ca19171a168fcbb0632c mini_httpd.initd
-701c8d393963836267289cba7352caaf61925c6a7e4903f0d418245415b214e17dcab3497697dd5c9ab80f3f71c9cb5dbcc0a3706bc6be25b6031da000ee0ef0 mini_httpd.logrotate"
+701c8d393963836267289cba7352caaf61925c6a7e4903f0d418245415b214e17dcab3497697dd5c9ab80f3f71c9cb5dbcc0a3706bc6be25b6031da000ee0ef0 mini_httpd.logrotate
+ee521382044d0a67791bde53ca8d69f4716b2cb0227f5cc936501b46dffd2f2c2b609f9a151cc3d5b0fd7da48a38bbe7a201335a8accc7f7fa29683bbdc9ba34 cgi.patch"
diff --git a/main/mini_httpd/cgi.patch b/main/mini_httpd/cgi.patch
new file mode 100644
index 0000000000..f459bb4584
--- /dev/null
+++ b/main/mini_httpd/cgi.patch
@@ -0,0 +1,11 @@
+--- a/mini_httpd.c
++++ b/mini_httpd.c
+@@ -1841,7 +1841,7 @@
+ /* Interposer process. */
+ (void) close( p[0] );
+ cgi_interpose_input( p[1] );
+- finish_request( 0 );
++ exit( 0 );
+ }
+ (void) close( p[1] );
+ if ( p[0] != STDIN_FILENO )