diff options
| author | Evan Prodromou <evan@status.net> | 2009-11-10 16:27:23 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-11-10 16:27:23 -0500 |
| commit | 1f5f5474f175a8248b362f8be4ff23bb5e971305 (patch) | |
| tree | c38d9b80db71ba403c61079502bc12bfe2732654 /classes/File_redirection.php | |
| parent | 348b155376eac2130150cd041bca9fd4799334cf (diff) | |
| parent | 651cbf0681b6d263dde673ce36811710bfe553b8 (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 c951c1ee7..08a6e8d8b 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 will not need body content here. + 'store_body' => false, // We won't need body content here. )); return $request; } @@ -81,12 +81,12 @@ class File_redirection extends Memcached_DataObject } try { $request = self::_commonHttp($short_url, $redirs); - // Do not include body in output + // Don't include body in output $request->setMethod(HTTP_Request2::METHOD_HEAD); $response = $request->send(); if (405 == $response->getStatus()) { - // Server does not support HEAD method? Can this really happen? + // Server doesn't 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': - // do not touch anything + // don't touch anything break; default: |