Changes in protocols/http_client.c [fe23720:0602496]

File:

• protocols/http_client.c (modified) (13 diffs)

protocols/http_client.c

@@ -157 +157 @@
         
 error:
-        req->status_string = g_strdup( "Error while writing HTTP request" );
-        
         req->func( req );
         
@@ -218 +216 @@
                         if( !sockerr_again() )
                         {
-                                req->status_string = g_strdup( strerror( errno ) );
                                 goto cleanup;
                         }
@@ -246 +243 @@
            support... */
         if( req->bytes_read == 0 )
-        {
-                req->status_string = g_strdup( "Empty HTTP reply" );
                 goto cleanup;
-        }
         
         /* Zero termination is very convenient. */
@@ -270 +264 @@
         else
         {
-                req->status_string = g_strdup( "Malformed HTTP reply" );
                 goto cleanup;
         }
@@ -286 +279 @@
         {
                 if( sscanf( end1 + 1, "%d", &req->status_code ) != 1 )
-                {
-                        req->status_string = g_strdup( "Can't parse status code" );
                         req->status_code = -1;
-                }
-                else
-                {
-                        char *eol;
-                        
-                        if( evil_server )
-                                eol = strchr( end1, '\n' );
-                        else
-                                eol = strchr( end1, '\r' );
-                        
-                        req->status_string = g_strndup( end1 + 1, eol - end1 - 1 );
-                        
-                        /* Just to be sure... */
-                        if( ( eol = strchr( req->status_string, '\r' ) ) )
-                                *eol = 0;
-                        if( ( eol = strchr( req->status_string, '\n' ) ) )
-                                *eol = 0;
-                }
-        }
-        else
-        {
-                req->status_string = g_strdup( "Can't locate status code" );
+        }
+        else
+        {
                 req->status_code = -1;
         }
@@ -319 +291 @@
                 int error = 0, new_port, new_proto;
                 
-                /* We might fill it again, so let's not leak any memory. */
-                g_free( req->status_string );
-                req->status_string = NULL;
-                
                 loc = strstr( req->reply_headers, "\nLocation: " );
                 if( loc == NULL ) /* We can't handle this redirect... */
-                {
-                        req->status_string = g_strdup( "Can't locate Location: header" );
                         goto cleanup;
-                }
                 
                 loc += 11;
@@ -345 +310 @@
                            don't need this yet anyway, I won't implement it. */
                         
-                        req->status_string = g_strdup( "Can't handle recursive redirects" );
-                        
                         goto cleanup;
                 }
@@ -364 +327 @@
                         if( !url_set( url, loc ) )
                         {
-                                req->status_string = g_strdup( "Malformed redirect URL" );
                                 g_free( url );
                                 goto cleanup;
@@ -375 +337 @@
                            going to use strcat(), whether you like it or not. :-) */
                         
-                        sprintf( new_request, "GET %s HTTP/1.0", url->file );
-                        
-                        s = strstr( req->request, "\r\n" );
+                        /* First, find the GET/POST/whatever from the original request. */
+                        s = strchr( req->request, ' ' );
                         if( s == NULL )
                         {
-                                req->status_string = g_strdup( "Error while rebuilding request string" );
                                 g_free( new_request );
                                 g_free( url );
@@ -386 +346 @@
                         }
                         
-                        strcat( new_request, s );
+                        *s = 0;
+                        sprintf( new_request, "%s %s HTTP/1.0\r\n", req->request, url->file );
+                        *s = ' ';
+                        
+                        s = strstr( req->request, "\r\n" );
+                        if( s == NULL )
+                        {
+                                g_free( new_request );
+                                g_free( url );
+                                goto cleanup;
+                        }
+                        
+                        strcat( new_request, s + 2 );
                         new_host = g_strdup( url->host );
                         new_port = url->port;
@@ -400 +372 @@
                 
                 req->fd = -1;
-                req->ssl = NULL;
+                req->ssl = 0;
                 
                 if( new_proto == PROTO_HTTPS )
@@ -418 +390 @@
                 if( error )
                 {
-                        req->status_string = g_strdup( "Connection problem during redirect" );
                         g_free( new_request );
                         goto cleanup;
@@ -447 +418 @@
         g_free( req->request );
         g_free( req->reply_headers );
-        g_free( req->status_string );
         g_free( req );
 }