Commit 185baf03 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

NOBODY set TRUE after a POST makes a good HEAD now

parent 35236138

CHANGES

+12 −0
Original line number Diff line number Diff line
@@ -6,7 +6,19 @@ 


                                  Changelog



Daniel (30 June 2004)

- Niels van Tongeren found that setting CURLOPT_NOBODY to TRUE doesn't disable

  a previously set POST request, making a very odd request get sent (unless

  you disabled the POST) a HEAD request with a POST request-body. I've now

  made CURLOPT_NOBODY enforce a proper HEAD. Added test case 514 for this.



Daniel (29 June 2004)

- Günter Knauf made the testcurl.pl script capable of using a custom setup

  file to easier run multiple autobuilds on the same source tree.



- Gisle fixed the djgpp build and fixed a memory problem in some of the

  reorged name resolved code.



- Fixed code to allow connects done using the multi interface to attempt the

  next IP when connecting to a host that resolves to multiple IPs and a

  connect attempt fails.

lib/url.c

+3 −0
Original line number Diff line number Diff line
@@ -488,6 +488,9 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...) 
     * Do not include the body part in the output data stream.

     */

    data->set.opt_no_body = va_arg(param, long)?TRUE:FALSE;

    if(data->set.opt_no_body)

      /* in HTTP lingo, this means using the HEAD request */

      data->set.httpreq = HTTPREQ_HEAD;

    break;

  case CURLOPT_FAILONERROR:

    /*

tests/data/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ 
 test158 test159 test511 test160 test161 test162 test163 test164	\

 test512 test165 test166 test167 test168 test169 test170 test171	\

 test172 test204 test205 test173 test174 test175 test176 test177	\

 test513

 test513 test514



# The following tests have been removed from the dist since they no longer

# work. We need to fix the test suite's FTPS server first, then bring them

tests/data/test514

0 → 100644
+49 −0
Original line number Diff line number Diff line 
#

# Server-side

<reply>

<data>

HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake

Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT

ETag: "21025-dc7-39462498"

Accept-Ranges: bytes

Content-Length: 6

Connection: close

Content-Type: text/html

Funny-head: yesyes



</data>

</reply>



#

# Client-side

<client>

<server>

http

</server>

<tool>

lib514

</tool>

 <name>

First set options to POST and then to make HEAD

 </name>

 <command>

http://%HOSTIP:%HOSTPORT/514

</command>

</client>



#

# Verify data after the test has been "shot"

<verify>

<strip>

^User-Agent:.*

</strip>

<protocol>

HEAD /514 HTTP/1.1

Host: 127.0.0.1:8999

Pragma: no-cache

Accept: */*



</protocol>

</verify>

tests/libtest/Makefile.am

+5 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ SUPPORTFILES = first.c test.h 


# These are all libcurl test programs

noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505 lib506 lib507 \

  lib508 lib509 lib510 lib511 lib512 lib513

  lib508 lib509 lib510 lib511 lib512 lib513 lib514



lib500_SOURCES = lib500.c $(SUPPORTFILES)

lib500_LDADD = $(LIBDIR)/libcurl.la
@@ -96,3 +96,7 @@ lib512_DEPENDENCIES = $(LIBDIR)/libcurl.la 
lib513_SOURCES = lib513.c $(SUPPORTFILES)

lib513_LDADD = $(LIBDIR)/libcurl.la

lib513_DEPENDENCIES = $(LIBDIR)/libcurl.la



lib514_SOURCES = lib514.c $(SUPPORTFILES)

lib514_LDADD = $(LIBDIR)/libcurl.la

lib514_DEPENDENCIES = $(LIBDIR)/libcurl.la