Reverting #554106. Causes failures in path-related tests.

1 files changed, 6 insertions, 13 deletions

diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index 1755d0bc7..51b983a34 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -1237,7 +1237,8 @@ class DrupalWebTestCase extends DrupalTestCase {
       $curl_options = $this->additionalCurlOptions + array(
         CURLOPT_COOKIEJAR => $this->cookieFile,
         CURLOPT_URL => $base_url,
-        CURLOPT_FOLLOWLOCATION => FALSE,
+        CURLOPT_FOLLOWLOCATION => TRUE,
+        CURLOPT_MAXREDIRS => 5,
         CURLOPT_RETURNTRANSFER => TRUE,
         CURLOPT_SSL_VERIFYPEER => FALSE, // Required to make the tests run on https.
         CURLOPT_SSL_VERIFYHOST => FALSE, // Required to make the tests run on https.
@@ -1388,7 +1389,7 @@ class DrupalWebTestCase extends DrupalTestCase {
     $this->refreshVariables(); // Ensure that any changes to variables in the other thread are picked up.
 
     // Replace original page output with new output from redirected page(s).
-    if (($new = $this->checkForRedirect())) {
+    if (($new = $this->checkForMetaRefresh())) {
       $out = $new;
     }
     $this->verbose('GET request to: ' . $path .
@@ -1478,7 +1479,7 @@ class DrupalWebTestCase extends DrupalTestCase {
           $this->refreshVariables();
 
           // Replace original page output with new output from redirected page(s).
-          if (($new = $this->checkForRedirect())) {
+          if (($new = $this->checkForMetaRefresh())) {
             $out = $new;
           }
           $this->verbose('POST request to: ' . $path .
@@ -1498,22 +1499,14 @@ class DrupalWebTestCase extends DrupalTestCase {
   }
 
   /**
-   * Check for meta refresh tag or HTTP location header.
-   *
-   * If either redirect indicators are found call drupalGet() recursively. This
+   * Check for meta refresh tag and if found call drupalGet() recursively. This
    * function looks for the http-equiv attribute to be set to "Refresh"
    * and is case-sensitive.
    *
    * @return
    *   Either the new page content or FALSE.
    */
-  protected function checkForRedirect() {
-    foreach ($this->headers as $header) {
-      if (strpos($header, 'Location') !== FALSE) {
-        return $this->drupalGet(trim(str_replace('Location:', '', $header)));
-      }
-    }
-
+  protected function checkForMetaRefresh() {
     if ($this->drupalGetContent() != '' && $this->parse()) {
       $refresh = $this->xpath('//meta[@http-equiv="Refresh"]');
       if (!empty($refresh)) {