Revert "Drupal 7.43"

This reverts commit 2f54b101bf722849e456d859876b27b90ad7e479.

3 files changed, 0 insertions, 111 deletions

diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test
index 92aefe48f..bf8557619 100644
--- a/modules/simpletest/tests/common.test
+++ b/modules/simpletest/tests/common.test
@@ -373,65 +373,6 @@ class CommonURLUnitTest extends DrupalWebTestCase {
 }
 
 /**
- * Tests url_is_external().
- */
-class UrlIsExternalUnitTest extends DrupalUnitTestCase {
-
-  public static function getInfo() {
-    return array(
-      'name' => 'External URL checking',
-      'description' => 'Performs tests on url_is_external().',
-      'group' => 'System',
-    );
-  }
-
-  /**
-   * Tests if each URL is external or not.
-   */
-  function testUrlIsExternal() {
-    foreach ($this->examples() as $path => $expected) {
-      $this->assertIdentical(url_is_external($path), $expected, $path);
-    }
-  }
-
-  /**
-   * Provides data for testUrlIsExternal().
-   *
-   * @return array
-   *   An array of test data, keyed by a path, with the expected value where
-   *   TRUE is external, and FALSE is not external.
-   */
-  protected function examples() {
-    return array(
-      // Simple external URLs.
-      'http://example.com' => TRUE,
-      'https://example.com' => TRUE,
-      'http://drupal.org/foo/bar?foo=bar&bar=baz&baz#foo' => TRUE,
-      '//drupal.org' => TRUE,
-      // Some browsers ignore or strip leading control characters.
-      "\x00//www.example.com" => TRUE,
-      "\x08//www.example.com" => TRUE,
-      "\x1F//www.example.com" => TRUE,
-      "\n//www.example.com" => TRUE,
-      // JSON supports decoding directly from UTF-8 code points.
-      json_decode('"\u00AD"') . "//www.example.com" => TRUE,
-      json_decode('"\u200E"') . "//www.example.com" => TRUE,
-      json_decode('"\uE0020"') . "//www.example.com" => TRUE,
-      json_decode('"\uE000"')  . "//www.example.com" => TRUE,
-      // Backslashes should be normalized to forward.
-      '\\\\example.com' => TRUE,
-      // Local URLs.
-      'node' => FALSE,
-      '/system/ajax' => FALSE,
-      '?q=foo:bar' => FALSE,
-      'node/edit:me' => FALSE,
-      '/drupal.org' => FALSE,
-      '<front>' => FALSE,
-    );
-  }
-}
-
-/**
  * Tests for check_plain(), filter_xss(), format_string(), and check_url().
  */
 class CommonXssUnitTest extends DrupalUnitTestCase {
@@ -1315,15 +1256,6 @@ class DrupalGotoTest extends DrupalWebTestCase {
     $this->assertText('drupal_goto', 'Drupal goto redirect succeeded.');
     $this->assertEqual($this->getUrl(), url('common-test/drupal_goto', array('query' => array('foo' => '123'), 'absolute' => TRUE)), 'Drupal goto redirected to expected URL.');
 
-    // Test that calling drupal_goto() on the current path is not dangerous.
-    variable_set('common_test_redirect_current_path', TRUE);
-    $this->drupalGet('', array('query' => array('q' => 'http://www.example.com/')));
-    $headers = $this->drupalGetHeaders(TRUE);
-    list(, $status) = explode(' ', $headers[0][':status'], 3);
-    $this->assertEqual($status, 302, 'Expected response code was sent.');
-    $this->assertNotEqual($this->getUrl(), 'http://www.example.com/', 'Drupal goto did not redirect to external URL.');
-    $this->assertTrue(strpos($this->getUrl(), url('<front>', array('absolute' => TRUE))) === 0, 'Drupal redirected to itself.');
-    variable_del('common_test_redirect_current_path');
     // Test that drupal_goto() respects ?destination=xxx. Use an complicated URL
     // to test that the path is encoded and decoded properly.
     $destination = 'common-test/drupal_goto/destination?foo=%2525&bar=123';
diff --git a/modules/simpletest/tests/common_test.module b/modules/simpletest/tests/common_test.module
index 2eb8cd5d2..674a49446 100644
--- a/modules/simpletest/tests/common_test.module
+++ b/modules/simpletest/tests/common_test.module
@@ -93,15 +93,6 @@ function common_test_drupal_goto_alter(&$path, &$options, &$http_response_code)
 }
 
 /**
- * Implements hook_init().
- */
-function common_test_init() {
-  if (variable_get('common_test_redirect_current_path', FALSE)) {
-    drupal_goto(current_path());
-  }
-}
-
-/**
  * Print destination query parameter.
  */
 function common_test_destination() {
diff --git a/modules/simpletest/tests/xmlrpc.test b/modules/simpletest/tests/xmlrpc.test
index bb74f059b..1a9ef2349 100644
--- a/modules/simpletest/tests/xmlrpc.test
+++ b/modules/simpletest/tests/xmlrpc.test
@@ -246,38 +246,4 @@ class XMLRPCMessagesTestCase extends DrupalWebTestCase {
     $this->assertEqual($removed, 'system.methodSignature', 'Hiding builting system.methodSignature with hook_xmlrpc_alter works');
   }
 
-  /**
-   * Test limits on system.multicall that can prevent brute-force attacks.
-   */
-  function testMulticallLimit() {
-    $url = url(NULL, array('absolute' => TRUE)) . 'xmlrpc.php';
-    $multicall_args = array();
-    $num_method_calls = 10;
-    for ($i = 0; $i < $num_method_calls; $i++) {
-      $struct = array('i' => $i);
-      $multicall_args[] = array('methodName' => 'validator1.echoStructTest', 'params' => array($struct));
-    }
-    // Test limits of 1, 5, 9, 13.
-    for ($limit = 1; $limit < $num_method_calls + 4; $limit += 4) {
-      variable_set('xmlrpc_multicall_duplicate_method_limit', $limit);
-      $results = xmlrpc($url, array('system.multicall' => array($multicall_args)));
-      $this->assertEqual($num_method_calls, count($results));
-      for ($i = 0; $i < min($limit, $num_method_calls); $i++) {
-        $x = array_shift($results);
-        $this->assertTrue(empty($x->is_error), "Result $i is not an error");
-        $this->assertEqual($multicall_args[$i]['params'][0], $x);
-      }
-      for (; $i < $num_method_calls; $i++) {
-        $x = array_shift($results);
-        $this->assertFalse(empty($x->is_error), "Result $i is an error");
-        $this->assertEqual(-156579, $x->code);
-      }
-    }
-    variable_set('xmlrpc_multicall_duplicate_method_limit', -1);
-    $results = xmlrpc($url, array('system.multicall' => array($multicall_args)));
-    $this->assertEqual($num_method_calls, count($results));
-    foreach ($results as $i => $x) {
-      $this->assertTrue(empty($x->is_error), "Result $i is not an error");
-    }
-  }
 }