- Patch #276008 by lilou, Arancaytar: missing user agent should not trigger a notice per the HTTP specification.

merge-requests/26/head
Dries Buytaert 2009-06-17 13:40:26 +00:00
parent 1a089351e0
commit b65538567d
2 changed files with 2 additions and 2 deletions

View File

@ -1358,7 +1358,7 @@ abstract class Database {
// We need to pass around the simpletest database prefix in the request
// and we put that in the user_agent header.
if (preg_match("/^simpletest\d+$/", $_SERVER['HTTP_USER_AGENT'])) {
if (isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/^simpletest\d+$/", $_SERVER['HTTP_USER_AGENT'])) {
$db_prefix .= $_SERVER['HTTP_USER_AGENT'];
}
return $new_connection;

View File

@ -260,7 +260,7 @@ class SimpleTestFunctionalTest extends DrupalWebTestCase {
* @return The test is being run from inside a CURL request.
*/
function inCURL() {
return preg_match("/^simpletest\d+/", $_SERVER['HTTP_USER_AGENT']);
return isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/^simpletest\d+/", $_SERVER['HTTP_USER_AGENT']);
}
}