bagder: curl/lib url.c,1.468,1.469

Update of /cvsroot/curl/curl/lib
In directory labb:/tmp/cvs-serv15631/lib

Modified Files:
        url.c 
Log Message:
If any of the options CURLOPT_HTTPGET, CURLOPT_POST and CURLOPT_HTTPPOST is
set to 1, CURLOPT_NOBODY will now automatically be set to 0.


Index: url.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/url.c,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -d -r1.468 -r1.469
--- url.c       27 Jul 2005 22:17:15 -0000      1.468
+++ url.c       27 Jul 2005 22:29:50 -0000      1.469
@@ -644,8 +644,10 @@
     /* Does this option serve a purpose anymore? Yes it does, when
        CURLOPT_POSTFIELDS isn't used and the POST data is read off the
        callback! */
-    if(va_arg(param, long))
+    if(va_arg(param, long)) {
       data->set.httpreq = HTTPREQ_POST;
+      data->set.opt_no_body = FALSE; /* this is implied */
+    }
     else
       data->set.httpreq = HTTPREQ_GET;
     break;
@@ -680,6 +682,7 @@
      */
     data->set.httppost = va_arg(param, struct curl_httppost *);
     data->set.httpreq = HTTPREQ_POST_FORM;
+    data->set.opt_no_body = FALSE; /* this is implied */
     break;
 
   case CURLOPT_REFERER:
@@ -813,6 +816,7 @@
     if(va_arg(param, long)) {
       data->set.httpreq = HTTPREQ_GET;
       data->set.upload = FALSE; /* switch off upload */
+      data->set.opt_no_body = FALSE; /* this is implied */
     }
     break;
 

_______________________________________________
http://cool.haxx.se/mailman/listinfo/curl-commits