Commit 10beb36b authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Ulf Härnhammar fixed a format string (printf style) problem in the Negotiate 

code. It should however not be the cause of any troubles. He also fixed a
few similar problems in the HTTP test server code.
parent a65a8888

CHANGES

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




                                  Changelog

                                  Changelog





Daniel (18 February 2006)

- Ulf Härnhammar fixed a format string (printf style) problem in the Negotiate

  code. It should however not be the cause of any troubles. He also fixed a

  few similar problems in the HTTP test server code.



Daniel (17 February 2006)

Daniel (17 February 2006)

- Shmulik Regev provided a fix for the DNS cache when using short life times,

- Shmulik Regev provided a fix for the DNS cache when using short life times,

  as previously it could be holding on to old cached entries longer than

  as previously it could be holding on to old cached entries longer than

RELEASE-NOTES

+2 −1
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ This release includes the following changes: 




This release includes the following bugfixes:

This release includes the following bugfixes:





 o minor format string mistake in the GSS/Negotiate code

 o cached DNS entries could remain in the cache too long

 o cached DNS entries could remain in the cache too long

 o improved GnuTLS check in configure

 o improved GnuTLS check in configure

 o re-used FTP connections when the second request didn't do a transfer

 o re-used FTP connections when the second request didn't do a transfer
@@ -63,6 +64,6 @@ advice from friends like these: 
 Dov Murik, Jean Jacques Drouin, Andres Garcia, Yang Tse, Gisle Vanem, Dan

 Dov Murik, Jean Jacques Drouin, Andres Garcia, Yang Tse, Gisle Vanem, Dan

 Fandrich, Alexander Lazic, Michael Jahn, Andrew Benham, Bryan Henderson,

 Fandrich, Alexander Lazic, Michael Jahn, Andrew Benham, Bryan Henderson,

 David Shaw, Jon Turner, Duane Cathey, Michal Marek, Philippe Vaucher, Kent

 David Shaw, Jon Turner, Duane Cathey, Michal Marek, Philippe Vaucher, Kent

 Boortz, Karl Moerder, Shmulik Regev

 Boortz, Karl Moerder, Shmulik Regev, Ulf Härnhammar

 

 

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

lib/http_negotiate.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -111,7 +111,7 @@ log_gss_error(struct connectdata *conn, OM_uint32 error_status, char *prefix) 
    gss_release_buffer(&min_stat, &status_string);

    gss_release_buffer(&min_stat, &status_string);

  } while (!GSS_ERROR(maj_stat) && msg_ctx != 0);

  } while (!GSS_ERROR(maj_stat) && msg_ctx != 0);





  infof(conn->data, buf);

  infof(conn->data, "%s", buf);

}

}





int Curl_input_negotiate(struct connectdata *conn, char *header)

int Curl_input_negotiate(struct connectdata *conn, char *header)

tests/server/sws.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -219,7 +219,7 @@ int ProcessRequest(struct httprequest *req) 
      else

      else

        sprintf(logbuf, "Got a *HUGE* request HTTP/%d.%d",

        sprintf(logbuf, "Got a *HUGE* request HTTP/%d.%d",

                prot_major, prot_minor);

                prot_major, prot_minor);

      logmsg(logbuf);

      logmsg("%s", logbuf);





      if(!strncmp("/verifiedserver", ptr, 15)) {

      if(!strncmp("/verifiedserver", ptr, 15)) {

        logmsg("Are-we-friendly question received");

        logmsg("Are-we-friendly question received");
@@ -251,7 +251,7 @@ int ProcessRequest(struct httprequest *req) 
      sprintf(logbuf, "Requested test number %ld part %ld",

      sprintf(logbuf, "Requested test number %ld part %ld",

              req->testno, req->partno);

              req->testno, req->partno);





      logmsg(logbuf);

      logmsg("%s", logbuf);





      filename = test2file(req->testno);

      filename = test2file(req->testno);
@@ -294,7 +294,7 @@ int ProcessRequest(struct httprequest *req) 
                doc, &prot_major, &prot_minor) == 3) {

                doc, &prot_major, &prot_minor) == 3) {

        sprintf(logbuf, "Receiced a CONNECT %s HTTP/%d.%d request",

        sprintf(logbuf, "Receiced a CONNECT %s HTTP/%d.%d request",

                doc, prot_major, prot_minor);

                doc, prot_major, prot_minor);

        logmsg(logbuf);

        logmsg("%s", logbuf);





        if(prot_major*10+prot_minor == 10)

        if(prot_major*10+prot_minor == 10)

          req->open = FALSE; /* HTTP 1.0 closes connection by default */

          req->open = FALSE; /* HTTP 1.0 closes connection by default */