Changeset 7deb447 for protocols/http_client.c

Timestamp:

2006-05-26T18:32:50Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fe23720

Parents:

6048744

Message:

Added status_string variable to http_client.

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 );
         
@@ -216 +218 @@
                         if( !sockerr_again() )
                         {
+                                req->status_string = g_strdup( strerror( errno ) );
                                 goto cleanup;
                         }
@@ -243 +246 @@
            support... */
         if( req->bytes_read == 0 )
+        {
+                req->status_string = g_strdup( "Empty HTTP reply" );
                 goto cleanup;
+        }
         
         /* Zero termination is very convenient. */
@@ -264 +270 @@
         else
         {
+                req->status_string = g_strdup( "Malformed HTTP reply" );
                 goto cleanup;
         }
@@ -279 +286 @@
         {
                 if( sscanf( end1 + 1, "%d", &req->status_code ) != 1 )
+                {
+                        req->status_string = g_strdup( "Can't parse status code" );
                         req->status_code = -1;
-        }
-        else
-        {
+                }
+                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" );
                 req->status_code = -1;
         }
@@ -291 +319 @@
                 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;
@@ -310 +345 @@
                            don't need this yet anyway, I won't implement it. */
                         
+                        req->status_string = g_strdup( "Can't handle recursive redirects" );
+                        
                         goto cleanup;
                 }
@@ -327 +364 @@
                         if( !url_set( url, loc ) )
                         {
+                                req->status_string = g_strdup( "Malformed redirect URL" );
                                 g_free( url );
                                 goto cleanup;
@@ -341 +379 @@
                         if( s == NULL )
                         {
+                                req->status_string = g_strdup( "Error while rebuilding request string" );
                                 g_free( new_request );
                                 g_free( url );
@@ -353 +392 @@
                         if( s == NULL )
                         {
+                                req->status_string = g_strdup( "Error while rebuilding request string" );
                                 g_free( new_request );
                                 g_free( url );
@@ -372 +412 @@
                 
                 req->fd = -1;
-                req->ssl = 0;
+                req->ssl = NULL;
                 
                 if( new_proto == PROTO_HTTPS )
@@ -390 +430 @@
                 if( error )
                 {
+                        req->status_string = g_strdup( "Connection problem during redirect" );
                         g_free( new_request );
                         goto cleanup;
@@ -418 +459 @@
         g_free( req->request );
         g_free( req->reply_headers );
+        g_free( req->status_string );
         g_free( req );
 }