diff options
| author | Sarven Capadisli <csarven@status.net> | 2009-11-08 23:10:34 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2009-11-08 23:10:34 +0000 |
| commit | 8e58f241739b97bd53f78035781f16e2067a31d9 (patch) | |
| tree | 8ad366f5f408d1181b1816f607a120fe0c91c502 /classes/File_redirection.php | |
| parent | 2a0a363e1d846334bc37d46b5f6f42e64a5a96eb (diff) | |
| parent | b78a35ec73980d8dfa2fcb68ef81936f4b3c110b (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
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: |