diff options
| author | ryoon <ryoon> | 2012-05-18 20:56:28 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2012-05-18 20:56:28 +0000 |
| commit | f32d61000a6a1ee388f92cc3069b8e7bc3afa147 (patch) | |
| tree | 7591f75c550fb13837364f57eec7898896020e4c /www/apache24 | |
| parent | d586eb34a13b1ba41378697db5a79c075425f865 (diff) | |
| download | pkgsrc-f32d61000a6a1ee388f92cc3069b8e7bc3afa147.tar.gz | |
Bump PKGREVISION.
Fix PR pkg/46458
* Fix download delay problem
https://issues.apache.org/bugzilla/show_bug.cgi?id=53253
Diffstat (limited to 'www/apache24')
| -rw-r--r-- | www/apache24/Makefile | 3 | ||||
| -rw-r--r-- | www/apache24/distinfo | 3 | ||||
| -rw-r--r-- | www/apache24/patches/patch-server_core__filters.c | 26 |
3 files changed, 30 insertions, 2 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile index 5f2f7b8be1d..c472ab6e2ee 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2012/04/26 12:20:06 hans Exp $ +# $NetBSD: Makefile,v 1.7 2012/05/18 20:56:28 ryoon Exp $ DISTNAME= httpd-2.4.2 PKGNAME= ${DISTNAME:S/httpd/apache/} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ http://archive.apache.org/dist/httpd/ \ diff --git a/www/apache24/distinfo b/www/apache24/distinfo index 8ca742a31fc..e14d9672781 100644 --- a/www/apache24/distinfo +++ b/www/apache24/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2012/04/18 11:27:01 ryoon Exp $ +$NetBSD: distinfo,v 1.3 2012/05/18 20:56:28 ryoon Exp $ SHA1 (httpd-2.4.2.tar.bz2) = 8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2 RMD160 (httpd-2.4.2.tar.bz2) = 1b97ab44075bea0f398f507dacb5f719a87b720b @@ -13,3 +13,4 @@ SHA1 (patch-ai) = 867ac81fd14b1bd6af048ec57390d915956e9568 SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911 SHA1 (patch-am) = f14b260ffad2c7e8d26e5b614d4aeaf8506e195b SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df +SHA1 (patch-server_core__filters.c) = 331672c9a65691229518f31dcdae64382b392287 diff --git a/www/apache24/patches/patch-server_core__filters.c b/www/apache24/patches/patch-server_core__filters.c new file mode 100644 index 00000000000..a88a1f596da --- /dev/null +++ b/www/apache24/patches/patch-server_core__filters.c @@ -0,0 +1,26 @@ +$NetBSD: patch-server_core__filters.c,v 1.1 2012/05/18 20:56:29 ryoon Exp $ + +Fix PR pkg/46458 +Upstream bug report: https://issues.apache.org/bugzilla/show_bug.cgi?id=53253 + +--- server/core_filters.c.orig 2012-02-04 10:04:59.000000000 +0000 ++++ server/core_filters.c +@@ -640,18 +640,13 @@ static apr_status_t send_brigade_nonbloc + if ((apr_file_flags_get(fd) & APR_SENDFILE_ENABLED) && + (bucket->length >= AP_MIN_SENDFILE_BYTES)) { + if (nvec > 0) { +- (void)apr_socket_opt_set(s, APR_TCP_NOPUSH, 1); + rv = writev_nonblocking(s, vec, nvec, bb, bytes_written, c); + nvec = 0; + if (rv != APR_SUCCESS) { +- (void)apr_socket_opt_set(s, APR_TCP_NOPUSH, 0); + return rv; + } + } + rv = sendfile_nonblocking(s, bucket, bytes_written, c); +- if (nvec > 0) { +- (void)apr_socket_opt_set(s, APR_TCP_NOPUSH, 0); +- } + if (rv != APR_SUCCESS) { + return rv; + } |