[packages/apache.git] / apache-pollset-segv.patch

--- 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 };
Commit	Line	Data
e49f47f2	1	--- server/mpm/prefork/prefork.c 2009/01/12 11:37:23 733697
	2	+++ server/mpm/prefork/prefork.c 2009/01/12 11:37:32 733698
	3	@@ -517,8 +517,12 @@
	4	(void) ap_update_child_status(sbh, SERVER_READY, (request_rec *) NULL);
	5
	6	/* Set up the pollfd array */
	7	- /* ### check the status */
	8	- (void) apr_pollset_create(&pollset, num_listensocks, pchild, 0);
	9	+ status = apr_pollset_create(&pollset, num_listensocks, pchild, 0);
	10	+ if (status != APR_SUCCESS) {
	11	+ ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf,
	12	+ "Couldn't create pollset in child; check system or user limits");
	13	+ clean_child_exit(APEXIT_CHILDSICK); /* assume temporary resource issue */
	14	+ }
	15
	16	for (lr = ap_listeners, i = num_listensocks; i--; lr = lr->next) {
	17	apr_pollfd_t pfd = { 0 };