aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/http.c4
-rw-r--r--lib/http.h3
-rw-r--r--lib/transfer.c4
3 files changed, 4 insertions, 7 deletions
diff --git a/lib/http.c b/lib/http.c
index 76738b880..2cc1154fc 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -3080,11 +3080,11 @@ static CURLcode header_append(struct SessionHandle *data,
*/
CURLcode Curl_http_readwrite_headers(struct SessionHandle *data,
struct connectdata *conn,
- struct SingleRequest *k,
ssize_t *nread,
bool *stop_reading)
{
CURLcode result;
+ struct SingleRequest *k = &data->req;
/* header line within buffer loop */
do {
diff --git a/lib/http.h b/lib/http.h
index f6781cc99..155027d99 100644
--- a/lib/http.h
+++ b/lib/http.h
@@ -25,8 +25,6 @@
***************************************************************************/
#ifndef CURL_DISABLE_HTTP
-struct SingleRequest;
-
extern const struct Curl_handler Curl_handler_http;
#ifdef USE_SSL
@@ -127,7 +125,6 @@ struct HTTP {
CURLcode Curl_http_readwrite_headers(struct SessionHandle *data,
struct connectdata *conn,
- struct SingleRequest *k,
ssize_t *nread,
bool *stop_reading);
diff --git a/lib/transfer.c b/lib/transfer.c
index 636beedb0..3c5821692 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -441,7 +441,7 @@ static CURLcode readwrite_data(struct SessionHandle *data,
if(k->header) {
/* we are in parse-the-header-mode */
bool stop_reading = FALSE;
- result = Curl_http_readwrite_headers(data, conn, k, &nread, &stop_reading);
+ result = Curl_http_readwrite_headers(data, conn, &nread, &stop_reading);
if(result)
return result;
if(stop_reading)