GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

StatusNet_HTTPResponse now prefixed with GNUSocial_

Browse Source
This commit is contained in:
Mikael Nordfeldth 2013-09-19 16:11:04 +02:00
parent c3001ff82b
commit 792e1aeb47
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extlib/README
View File

@ -51,7 +51,7 @@ A: If the upstream project is moribund and there's a way to adopt it,
Q: What if there's no upstream authority and it can't be adopted?
A: Then we fork it. Make a new name and a new version. Include it in
lib/ instead of extlib/, and use the StatusNet_* prefix to change
lib/ instead of extlib/, and use the GNUSocial_* prefix to change
the namespace to avoid collisions.
This is a last resort; consult with the rest of the dev group

18
lib/httpclient.php
View File

@ -54,7 +54,7 @@ require_once 'HTTP/Request2/Response.php';
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
class StatusNet_HTTPResponse extends HTTP_Request2_Response
class GNUSocial_HTTPResponse extends HTTP_Request2_Response
{
function __construct(HTTP_Request2_Response $response, $url, $redirects=0)
{
@ -173,7 +173,7 @@ class HTTPClient extends HTTP_Request2
/**
* Convenience function to run a GET request.
*
* @return StatusNet_HTTPResponse
* @return GNUSocial_HTTPResponse
* @throws HTTP_Request2_Exception
*/
public function get($url, $headers=array())
@ -184,7 +184,7 @@ class HTTPClient extends HTTP_Request2
/**
* Convenience function to run a HEAD request.
*
* @return StatusNet_HTTPResponse
* @return GNUSocial_HTTPResponse
* @throws HTTP_Request2_Exception
*/
public function head($url, $headers=array())
@ -198,7 +198,7 @@ class HTTPClient extends HTTP_Request2
* @param string $url
* @param array $headers optional associative array of HTTP headers
* @param array $data optional associative array or blob of form data to submit
* @return StatusNet_HTTPResponse
* @return GNUSocial_HTTPResponse
* @throws HTTP_Request2_Exception
*/
public function post($url, $headers=array(), $data=array())
@ -210,7 +210,7 @@ class HTTPClient extends HTTP_Request2
}
/**
* @return StatusNet_HTTPResponse
* @return GNUSocial_HTTPResponse
* @throws HTTP_Request2_Exception
*/
protected function doRequest($url, $method, $headers)
@ -249,16 +249,16 @@ class HTTPClient extends HTTP_Request2
*/
function userAgent()
{
return "StatusNet/".STATUSNET_VERSION." (".STATUSNET_CODENAME.")";
return "GNU Social/".STATUSNET_VERSION." (".STATUSNET_CODENAME.")";
}
/**
* Actually performs the HTTP request and returns a
* StatusNet_HTTPResponse object with response body and header info.
* GNUSocial_HTTPResponse object with response body and header info.
*
* Wraps around parent send() to add logging and redirection processing.
*
* @return StatusNet_HTTPResponse
* @return GNUSocial_HTTPResponse
* @throw HTTP_Request2_Exception
*/
public function send()
@ -301,6 +301,6 @@ class HTTPClient extends HTTP_Request2
}
break;
} while ($maxRedirs);
return new StatusNet_HTTPResponse($response, $this->getUrl(), $redirs);
return new GNUSocial_HTTPResponse($response, $this->getUrl(), $redirs);
}
}