summaryrefslogtreecommitdiff
path: root/modules/simpletest/drupal_web_test_case.php
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2012-01-21 10:52:40 -0800
committerwebchick <webchick@24967.no-reply.drupal.org>2012-01-21 10:52:40 -0800
commit8164434505e4292e5d584eebbf7b05b403d9c07b (patch)
tree723b2507f6382b71902eb4bb7aa2a6c37a1e3c95 /modules/simpletest/drupal_web_test_case.php
parent283523192421f0708c01f7fa08d5814442c757a5 (diff)
downloadbrdo-8164434505e4292e5d584eebbf7b05b403d9c07b.tar.gz
brdo-8164434505e4292e5d584eebbf7b05b403d9c07b.tar.bz2
Issue #278425 by andypost, droplet, OnkelTem, chx, c960657, drewish, kotnik, realityloop: Change notice for: Using basename() is not locale safe.
Diffstat (limited to 'modules/simpletest/drupal_web_test_case.php')
-rw-r--r--modules/simpletest/drupal_web_test_case.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index 71c583315..9095e22e1 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -1672,7 +1672,16 @@ class DrupalWebTestCase extends DrupalTestCase {
* An header.
*/
protected function curlHeaderCallback($curlHandler, $header) {
- $this->headers[] = $header;
+ // Header fields can be extended over multiple lines by preceding each
+ // extra line with at least one SP or HT. They should be joined on receive.
+ // Details are in RFC2616 section 4.
+ if ($header[0] == ' ' || $header[0] == "\t") {
+ // Normalize whitespace between chucks.
+ $this->headers[] = array_pop($this->headers) . ' ' . trim($header);
+ }
+ else {
+ $this->headers[] = $header;
+ }
// Errors are being sent via X-Drupal-Assertion-* headers,
// generated by _drupal_log_error() in the exact form required