Commit 5ecd56d9 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Implemented only the parts of Patrick Monnerat's OS/400 patch that renamed 

some few internal identifiers to avoid conflicts, which could be useful on
other platforms.
parent cc44fb1d

CHANGES

+5 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,11 @@ 




                                  Changelog

                                  Changelog





Dan F (23 July 2007)

- Implemented only the parts of Patrick Monnerat's OS/400 patch that renamed

  some few internal identifiers to avoid conflicts, which could be useful on

  other platforms.



Daniel S (22 July 2007)

Daniel S (22 July 2007)

- HTTP Digest bug fix by Chris Flerackers:

- HTTP Digest bug fix by Chris Flerackers:

RELEASE-NOTES

+1 −1
Original line number Original line Diff line number Diff line
@@ -48,6 +48,6 @@ advice from friends like these: 




 Dan Fandrich, Song Ma, Daniel Black, Giancarlo Formicuccia, Shmulik Regev,

 Dan Fandrich, Song Ma, Daniel Black, Giancarlo Formicuccia, Shmulik Regev,

 Daniel Cater, Colin Hogben, Jofell Gallardo, Daniel Johnson,

 Daniel Cater, Colin Hogben, Jofell Gallardo, Daniel Johnson,

 Ralf S. Engelschall, James Housley, Chris Flerackers

 Ralf S. Engelschall, James Housley, Chris Flerackers, Patrick Monnerat

 

 

        Thanks! (and sorry if I forgot to mention someone)
 
        Thanks! (and sorry if I forgot to mention someone)

lib/easy.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -696,10 +696,10 @@ void curl_easy_reset(CURL *curl) 
  data->set.err  = stderr;  /* default stderr to stderr */

  data->set.err  = stderr;  /* default stderr to stderr */





  /* use fwrite as default function to store output */

  /* use fwrite as default function to store output */

  data->set.fwrite = (curl_write_callback)fwrite;

  data->set.fwrite_func = (curl_write_callback)fwrite;





  /* use fread as default function to read input */

  /* use fread as default function to read input */

  data->set.fread = (curl_read_callback)fread;

  data->set.fread_func = (curl_read_callback)fread;





  data->set.infilesize = -1; /* we don't know any size */

  data->set.infilesize = -1; /* we don't know any size */

  data->set.postfieldsize = -1;

  data->set.postfieldsize = -1;

lib/file.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -205,7 +205,7 @@ static CURLcode file_upload(struct connectdata *conn) 
   * Since FILE: doesn't do the full init, we need to provide some extra

   * Since FILE: doesn't do the full init, we need to provide some extra

   * assignments here.

   * assignments here.

   */

   */

  conn->fread = data->set.fread;

  conn->fread_func = data->set.fread_func;

  conn->fread_in = data->set.in;

  conn->fread_in = data->set.in;

  conn->data->reqdata.upload_fromhere = buf;

  conn->data->reqdata.upload_fromhere = buf;

lib/ftp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1477,7 +1477,7 @@ static CURLcode ftp_state_ul_setup(struct connectdata *conn, 
        readthisamountnow = BUFSIZE;

        readthisamountnow = BUFSIZE;





      actuallyread = (curl_off_t)

      actuallyread = (curl_off_t)

        conn->fread(data->state.buffer, 1, (size_t)readthisamountnow,

        conn->fread_func(data->state.buffer, 1, (size_t)readthisamountnow,

                    conn->fread_in);

                    conn->fread_in);





      passed += actuallyread;

      passed += actuallyread;