Merge branch 'master' into trunk-tracking

2013-11-07 17:46:30 -05:00
parent 530bf3c05e 94688bd1e5
commit 658a30d836
1 changed files with 2 additions and 2 deletions
@@ -69,11 +69,11 @@ function keepalive_test() {
  for ((i=0; i < 100; i++)); do
    for accept_encoding in "" "gzip"; do
      if [ -z "$POST_DATA" ]; then
-      curl -m 1 -S -s -v -H "Accept-Encoding: $accept_encoding" \
+        curl -m 2 -S -s -v -H "Accept-Encoding: $accept_encoding" \
          -H "Host: $HOST_NAME" $URL $URL $URL $URL $URL > /dev/null \
          2>>"$TEST_TMP/$CURL_LOG_FILE"
      else
-        curl -X POST --data "$POST_DATA" -m 1 -S -s -v \
+        curl -X POST --data "$POST_DATA" -m 2 -S -s -v \
          -H "Accept-Encoding: $accept_encoding" -H "Host: $HOST_NAME"\
          $URL $URL $URL $URL $URL > /dev/null \
          2>>"$TEST_TMP/$CURL_LOG_FILE"