diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-01-22 03:05:18 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-01-22 03:05:18 +0000 |
| commit | 7ac380aa059bd901e7965445080d2fddef84f9e9 (patch) | |
| tree | 295f99251d447053045eafb6c7bb036945beb315 /modules/simpletest | |
| parent | 3dc1157a1e2a85316029e70c95bed257c697f454 (diff) | |
| download | brdo-7ac380aa059bd901e7965445080d2fddef84f9e9.tar.gz brdo-7ac380aa059bd901e7965445080d2fddef84f9e9.tar.bz2 | |
#346285 by Damien Tournoud: forward-port HTTP_HOST fix from 6.x.
Diffstat (limited to 'modules/simpletest')
| -rw-r--r-- | modules/simpletest/tests/bootstrap.test | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/modules/simpletest/tests/bootstrap.test b/modules/simpletest/tests/bootstrap.test index a27f8cfaf..149c5ef49 100644 --- a/modules/simpletest/tests/bootstrap.test +++ b/modules/simpletest/tests/bootstrap.test @@ -71,20 +71,12 @@ class BootstrapIPAddressTestCase extends DrupalWebTestCase { ip_address(TRUE) == $this->cluster_ip, t('Cluster environment got cluster client IP') ); - $_SERVER['HTTP_HOST'] = 'security/.drupal.org:80'; - $this->assertFalse(drupal_valid_http_host(), t('HTTP_HOST with / is invalid')); - $_SERVER['HTTP_HOST'] = 'security\\.drupal.org:80'; - $this->assertFalse(drupal_valid_http_host(), t('HTTP_HOST with \\ is invalid')); - $_SERVER['HTTP_HOST'] = 'security<.drupal.org:80'; - $this->assertFalse(drupal_valid_http_host(), t('HTTP_HOST with < is invalid')); - $_SERVER['HTTP_HOST'] = 'security..drupal.org:80'; - $this->assertFalse(drupal_valid_http_host(), t('HTTP_HOST with .. is invalid')); - $_SERVER['HTTP_HOST'] = '[::1]:80'; // IPv6 loopback address - $this->assertTrue(drupal_valid_http_host(), t('HTTP_HOST containing IPv6 loopback is valid')); - $_SERVER['HTTP_HOST'] = ''; - $this->assertTrue(drupal_valid_http_host(), t('Empty HTTP_HOST is valid')); - $_SERVER['HTTP_HOST'] = NULL; - $this->assertTrue(drupal_valid_http_host(), t('NULL HTTP_HOST is valid')); + $this->assertFalse(drupal_valid_http_host('security/.drupal.org:80'), t('HTTP_HOST with / is invalid')); + $this->assertFalse(drupal_valid_http_host('security\\.drupal.org:80'), t('HTTP_HOST with \\ is invalid')); + $this->assertFalse(drupal_valid_http_host('security<.drupal.org:80'), t('HTTP_HOST with < is invalid')); + $this->assertFalse(drupal_valid_http_host('security..drupal.org:80'), t('HTTP_HOST with .. is invalid')); + // IPv6 loopback address + $this->assertTrue(drupal_valid_http_host('[::1]:80'), t('HTTP_HOST containing IPv6 loopback is valid')); } } |