diff options
author | Evan Prodromou <evan@status.net> | 2009-11-08 21:41:43 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-11-08 21:41:43 -0500 |
commit | 691beefd0f3755bab195279b1c0d7cc583942b72 (patch) | |
tree | 8c2e51f14d45759e57639ae90e999c192dcd0a17 /classes/File_redirection.php | |
parent | 76b0e6e6f4151235d5032d1aa90f0937b415bd87 (diff) | |
parent | aa0d9a86152d2485de6de5ec572ae87085ebe780 (diff) |
Merge branch '0.9.x' into adminpanel
Diffstat (limited to 'classes/File_redirection.php')
-rw-r--r-- | classes/File_redirection.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/File_redirection.php b/classes/File_redirection.php index 08a6e8d8b..c951c1ee7 100644 --- a/classes/File_redirection.php +++ b/classes/File_redirection.php @@ -53,7 +53,7 @@ class File_redirection extends Memcached_DataObject 'connect_timeout' => 10, // # seconds to wait 'max_redirs' => $redirs, // # max number of http redirections to follow 'follow_redirects' => true, // Follow redirects - 'store_body' => false, // We won't need body content here. + 'store_body' => false, // We will not need body content here. )); return $request; } @@ -81,12 +81,12 @@ class File_redirection extends Memcached_DataObject } try { $request = self::_commonHttp($short_url, $redirs); - // Don't include body in output + // Do not include body in output $request->setMethod(HTTP_Request2::METHOD_HEAD); $response = $request->send(); if (405 == $response->getStatus()) { - // Server doesn't support HEAD method? Can this really happen? + // Server does not support HEAD method? Can this really happen? // We'll try again as a GET and ignore the response data. $request = self::_commonHttp($short_url, $redirs); $response = $request->send(); @@ -178,7 +178,7 @@ class File_redirection extends Memcached_DataObject case 'aim': case 'jabber': case 'xmpp': - // don't touch anything + // do not touch anything break; default: |