svn commit: r1425777 - in /httpd/httpd/trunk: CHANGES server/mpm/event/event.c

[sf...@apache.org]

Author: sf
Date: Tue Dec 25 21:50:06 2012
New Revision: 1425777

URL: http://svn.apache.org/viewvc?rev=1425777&view=rev
Log:
Check that AsyncRequestWorkerFactor is not negative

PR :54254
Submitted by: Jackie Zhang <jackie qq zhang gmail com>

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/mpm/event/event.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1425777&r1=1425776&r2=1425777&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Dec 25 21:50:06 2012
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mpm_event: Check that AsyncRequestWorkerFactor is not negative. PR 54254.
+     [Jackie Zhang <jackie qq zhang gmail com>]
+
   *) httxt2dbm: Correct length computation for the 'value' stored in the DBM file
      PR 47650 [jon buckybox com]
 

Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1425777&r1=1425776&r2=1425777&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Tue Dec 25 21:50:06 2012
@@ -3338,6 +3338,9 @@ static const char *set_worker_factor(cmd
     if (*endptr)
         return "error parsing value";
 
+    if (val <= 0)
+        return "AsyncRequestWorkerFactor argument must be a positive number";
+
     worker_factor = val * WORKER_FACTOR_SCALE;
     if (worker_factor == 0)
         worker_factor = 1;