[Pkg-apache-commits] r1204 - in /trunk/apache2: changelog patches/00list patches/082_ab_num_requests.dpatch

[sf at alioth.debian.org]

Author: sf
Date: Fri Jul 16 20:28:50 2010
New Revision: 1204

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1204
Log:
Fix ab sending more requests than specified by the -n parameter

Added:
    trunk/apache2/patches/082_ab_num_requests.dpatch   (with props)
Modified:
    trunk/apache2/changelog
    trunk/apache2/patches/00list

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1204&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Fri Jul 16 20:28:50 2010
@@ -5,6 +5,8 @@
     for starting instead of calling apache2 directly. Closes: #580445
   * Fix debug info to allow gdb loading it automatically. Closes: #581514
   * Fix install target in Makefile created by apxs2 -n. Closes: #588787
+  * Fix ab sending more requests than specified by the -n parameter.
+    Closes: #541158
   * Build as PIE, since gdb in squeeze now supports it.
   * Update the postrm script to also purge the version of /var/www/index.html
     introduced in 2.2.11-7.

Modified: trunk/apache2/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/00list?rev=1204&op=diff
==============================================================================
--- trunk/apache2/patches/00list (original)
+++ trunk/apache2/patches/00list Fri Jul 16 20:28:50 2010
@@ -25,6 +25,7 @@
 079_polish_translation.dpatch
 080_mod_reqtimeout_fixes.dpatch
 081_apxs_perl_5.12.dpatch
+082_ab_num_requests
 099_config_guess_sub_update
 200_cp_suexec.dpatch
 201_build_suexec-custom.dpatch

Added: trunk/apache2/patches/082_ab_num_requests.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/082_ab_num_requests.dpatch?rev=1204&op=file
==============================================================================
--- trunk/apache2/patches/082_ab_num_requests.dpatch (added)
+++ trunk/apache2/patches/082_ab_num_requests.dpatch Fri Jul 16 20:28:50 2010
@@ -1,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 082_ab_num_requests.dpatch by Stefan Fritsch <sf at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream r940526, Debian bug #541158
+
+ at DPATCH@
+diff -urNad trunk~/support/ab.c trunk/support/ab.c
+--- trunk~/support/ab.c	2010-07-16 22:17:41.697762479 +0200
++++ trunk/support/ab.c	2010-07-16 22:17:45.661763246 +0200
+@@ -628,6 +628,10 @@
+ 
+ static void write_request(struct connection * c)
+ {
++    if (started >= requests) {
++        return;
++    }
++
+     do {
+         apr_time_t tnow;
+         apr_size_t l = c->rwrite;
+@@ -690,6 +694,7 @@
+         new_pollfd.client_data = c;
+         apr_pollset_add(readbits, &new_pollfd);
+     }
++    started++;
+ }
+ 
+ /* --------------------------------------------------------- */
+@@ -1239,7 +1244,6 @@
+ 
+     /* connected first time */
+     c->state = STATE_CONNECTED;
+-    started++;
+ #ifdef USE_SSL
+     if (c->ssl) {
+         ssl_proceed_handshake(c);
+@@ -1766,7 +1770,6 @@
+                     }
+                     else {
+                         c->state = STATE_CONNECTED;
+-                        started++;
+ #ifdef USE_SSL
+                         if (c->ssl)
+                             ssl_proceed_handshake(c);

Propchange: trunk/apache2/patches/082_ab_num_requests.dpatch
------------------------------------------------------------------------------
    svn:executable = *