Commit 437fd064 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

modified GetLine(), removed Curl_http_close()

parent 28dd4e4f

lib/http.c

+6 −25
Original line number Original line Diff line number Diff line
@@ -204,31 +204,18 @@ CURLcode add_buffer(send_buffer *in, const void *inptr, size_t size) 
 */

 */





static

static

int GetLine(int sockfd, char *buf, struct connectdata *conn)

int GetLine(int sockfd, char *ptr, struct connectdata *conn)

{

{

  ssize_t nread;

  ssize_t nread;

  int read_rc=1;

  char *ptr;

  struct SessionHandle *data=conn->data;



  ptr=buf;





  /* get us a full line, terminated with a newline */

  /* get us a full line, terminated with a newline */

  for(nread=0;

  for(nread=0; (nread<BUFSIZE); nread++, ptr++) {

      (nread<BUFSIZE) && read_rc;

      nread++, ptr++) {

    if((CURLE_OK != Curl_read(conn, sockfd, ptr, 1, &nread)) ||

    if((CURLE_OK != Curl_read(conn, sockfd, ptr, 1, &nread)) ||

       (nread <= 0) ||

       (nread <= 0) || (*ptr == '\n'))

       (*ptr == '\n'))

      break;

      break;

  }

  }

  *ptr=0; /* zero terminate */

  *ptr=0; /* zero terminate */

  

  

  if(data->set.verbose) {

    fputs("< ", data->set.err);

    fwrite(buf, 1, nread, data->set.err);

    fputs("\n", data->set.err);

  }

  return nread>0?nread:0;

  return nread>0?nread:0;

}

}
@@ -282,6 +269,9 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn, 
  while(GetLine(tunnelsocket, data->state.buffer, conn)) {

  while(GetLine(tunnelsocket, data->state.buffer, conn)) {

    if('\r' == data->state.buffer[0])

    if('\r' == data->state.buffer[0])

      break; /* end of headers */

      break; /* end of headers */

    if(data->set.verbose)

      fprintf(data->set.err, "< %s\n", data->state.buffer);



    if(2 == sscanf(data->state.buffer, "HTTP/1.%d %d",

    if(2 == sscanf(data->state.buffer, "HTTP/1.%d %d",

                   &subversion,

                   &subversion,

                   &httperror)) {

                   &httperror)) {
@@ -341,15 +331,6 @@ CURLcode Curl_http_connect(struct connectdata *conn) 
  return CURLE_OK;

  return CURLE_OK;

}

}





/* called from curl_close() when this struct is about to get wasted, free

   protocol-specific resources */

CURLcode Curl_http_close(struct connectdata *conn)

{

  if(conn->data->state.auth_host)

    free(conn->data->state.auth_host);

  return CURLE_OK;

}



CURLcode Curl_http_done(struct connectdata *conn)

CURLcode Curl_http_done(struct connectdata *conn)

{

{

  struct SessionHandle *data;

  struct SessionHandle *data;