diff --git a/src/pjdietz/WellRESTed/Message.php b/src/pjdietz/WellRESTed/Message.php index a7264d7..0aad5b1 100644 --- a/src/pjdietz/WellRESTed/Message.php +++ b/src/pjdietz/WellRESTed/Message.php @@ -62,6 +62,8 @@ abstract class Message return $this->getBody(); case 'headers': return $this->getHeaders(); + case 'headerLines': + return $this->getHeaderLines(); case 'protocol': return $this->getProtocol(); case 'protocolVersion': @@ -123,6 +125,20 @@ abstract class Message return $this->headers; } + /** + * Return an array containing one string for each header as "field: value" + * + * @return string + */ + public function getHeaderLines() + { + $lines = array(); + foreach ($this->headers as $field => $value) { + $lines[] = sprintf('%s: %s', $field, $value); + } + return $lines; + } + /** * Return the value of a given header, or false if it does not exist. * diff --git a/src/pjdietz/WellRESTed/Request.php b/src/pjdietz/WellRESTed/Request.php index 801b5a5..ae642c7 100644 --- a/src/pjdietz/WellRESTed/Request.php +++ b/src/pjdietz/WellRESTed/Request.php @@ -299,6 +299,9 @@ class Request extends Message } + // Add headers. + curl_setopt($ch, CURLOPT_HTTPHEADER, $this->headerLines); + // Make the cURL request. $result = curl_exec($ch); diff --git a/src/pjdietz/WellRESTed/Response.php b/src/pjdietz/WellRESTed/Response.php index cd96657..242d062 100644 --- a/src/pjdietz/WellRESTed/Response.php +++ b/src/pjdietz/WellRESTed/Response.php @@ -59,13 +59,6 @@ class Response extends Message if (!is_null($body)) { $this->body = $body; } - - if (isset($_SERVER['SERVER_PROTOCOL'])) { - $this->protocol = $_SERVER['SERVER_PROTOCOL']; - } else { - $this->protocol = 'HTTP/1.1'; - } - } // -------------------------------------------------------------------------