[arch-commits] Commit in apache/repos (3 files)

[Pierre Schmitz]

    Date: Thursday, January 29, 2009 @ 09:11:42
  Author: pierre
Revision: 25796

Merged revisions 25795 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/apache/trunk

........
  r25795 | pierre | 2009-01-29 15:11:02 +0100 (Do, 29 Jan 2009) | 1 line
  
  upgpkg: apache 2.2.11-2
........

Added:
  apache/repos/extra-x86_64/prefork.c.patch
    (from rev 25795, apache/trunk/prefork.c.patch)
Modified:
  apache/repos/extra-x86_64/	(properties)
  apache/repos/extra-x86_64/PKGBUILD

-----------------+
 PKGBUILD        |   10 +++++++---
 prefork.c.patch |   17 +++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)


Property changes on: apache/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /apache/trunk:1-21674
   + /apache/trunk:1-25795

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-01-29 14:11:02 UTC (rev 25795)
+++ extra-x86_64/PKGBUILD	2009-01-29 14:11:42 UTC (rev 25796)
@@ -3,7 +3,7 @@
 
 pkgname=apache
 pkgver=2.2.11
-pkgrel=1
+pkgrel=2
 pkgdesc="A high performance Unix-based HTTP server"
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -16,15 +16,19 @@
 depends=('openssl' 'zlib' 'apr-util' 'db' 'pcre')
 install='httpd.install'
 source=("http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2"
-        'httpd.logrotate' 'httpd' 'arch.layout')
+        'httpd.logrotate' 'httpd' 'arch.layout' 'prefork.c.patch')
 md5sums=('3e98bcb14a7122c274d62419566431bb'
          'f4d627c64024c1b7b95efb5ffbaa625e'
          'fb6baeced65b7cf5b80083f278adebba'
-         '3d659d41276ba3bfcb20c231eb254e0c')
+         '3d659d41276ba3bfcb20c231eb254e0c'
+         '171df0cf9b6b8d68c7a0cb392b68d0ec')
 
 build() {
 	cd ${srcdir}/httpd-${pkgver}
 
+	# see https://issues.apache.org/bugzilla/show_bug.cgi?id=46467
+	patch -p0 -i $srcdir/prefork.c.patch || return 1
+
 	# set default user
 	sed -e 's#User daemon#User http#' \
 	    -e 's#Group daemon#Group http#' \

Copied: apache/repos/extra-x86_64/prefork.c.patch (from rev 25795, apache/trunk/prefork.c.patch)
===================================================================
--- extra-x86_64/prefork.c.patch	                        (rev 0)
+++ extra-x86_64/prefork.c.patch	2009-01-29 14:11:42 UTC (rev 25796)
@@ -0,0 +1,17 @@
+--- server/mpm/prefork/prefork.c	2009/01/12 11:37:23	733697
++++ server/mpm/prefork/prefork.c	2009/01/12 11:37:32	733698
+@@ -517,8 +517,12 @@
+     (void) ap_update_child_status(sbh, SERVER_READY, (request_rec *) NULL);
+ 
+     /* Set up the pollfd array */
+-    /* ### check the status */
+-    (void) apr_pollset_create(&pollset, num_listensocks, pchild, 0);
++    status = apr_pollset_create(&pollset, num_listensocks, pchild, 0);
++    if (status != APR_SUCCESS) {
++        ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf,
++                     "Couldn't create pollset in child; check system or user limits");
++        clean_child_exit(APEXIT_CHILDSICK); /* assume temporary resource issue */
++    }
+ 
+     for (lr = ap_listeners, i = num_listensocks; i--; lr = lr->next) {
+         apr_pollfd_t pfd = { 0 };