Changeset 658

Timestamp:

09/08/08 23:12:09 (4 months ago)

Author:

smoku

Message:

Fixed sending stream errors on wrapper errors

Location:

trunk/sx

Files:

• compress.c (modified) (2 diffs)
• error.c (modified) (1 diff)
• io.c (modified) (7 diffs)
• ssl.c (modified) (3 diffs)

trunk/sx/compress.c

@@ -178 +178 @@
             _sx_event(s, event_ERROR, (void *) &sxe);
 
-            _sx_error(s, stream_err_INTERNAL_SERVER_ERROR, "Error during compression");
-            _sx_close(s);
+            sx_error(s, stream_err_INTERNAL_SERVER_ERROR, "Error during compression");
+            sx_close(s);
 
             return -2;  /* fatal */
@@ -237 +237 @@
                 _sx_event(s, event_ERROR, (void *) &sxe);
 
-                _sx_error(s, stream_err_INVALID_XML, "Error during decompression");
-                _sx_close(s);
+                sx_error(s, stream_err_INVALID_XML, "Error during decompression");
+                sx_close(s);
 
                 return -2;

trunk/sx/error.c

@@ -84 +84 @@
     /* stuff to write */
     s->want_write = 1;
-
-        _sx_event(s, event_WANT_WRITE, NULL);
 }
 

trunk/sx/io.c

@@ -126 +126 @@
                     _sx_state(s, state_CLOSING);
                 }
-    
+
                 if(errstring != NULL) free(errstring);
-    
+
                 nad_free(nad);
-    
+
                 break;
             }
-    
+
             /* run it by the plugins */
             if(_sx_chain_nad_read(s, nad) == 0)
                 return;
-    
+
             /* now let the plugins process the completed nad */
             plugin_error = 0;
@@ -150 +150 @@
                         }
                     }
-    
+
             /* hand it to the app */
             if ((plugin_error == 0) && (s->state < state_CLOSING))
@@ -159 +159 @@
     if(s->fail) {
         _sx_close(s);
-        
+
         return;
     }
@@ -209 +209 @@
         _sx_buffer_free(in);
         _sx_state(s, state_CLOSING);
-    
+
     } else {
         _sx_debug(ZONE, "passed %d read bytes", in->len);
@@ -316 +316 @@
     sx_buf_t out;
     int ret, written;
-    
+
     assert((int) (s != NULL));
 
@@ -346 +346 @@
     _sx_debug(ZONE, "handing app %d bytes to write", out->len);
     written = _sx_event(s, event_WRITE, (void *) out);
-    
+
     if(written < 0) {
         /* bail if something went wrong */
@@ -468 +468 @@
     /* close the stream if necessary */
     if(s->state >= state_STREAM_SENT) {
-        _sx_debug(ZONE, "sending closing </stream:stream>");
         jqueue_push(s->wbufq, _sx_buffer_new("</stream:stream>", 16, NULL, NULL), 0);
         s->want_write = 1;
-        _sx_state(s, state_CLOSING);
-        _sx_event(s, event_WANT_WRITE, NULL);
-    } else
-        _sx_state(s, state_CLOSING);
+    }
+
+    _sx_state(s, state_CLOSING);
 }
 

trunk/sx/ssl.c

@@ -252 +252 @@
                 _sx_event(s, event_ERROR, (void *) &sxe);
 
-                _sx_error(s, stream_err_INTERNAL_SERVER_ERROR, errstring);
-                _sx_close(s);
+                sx_error(s, stream_err_INTERNAL_SERVER_ERROR, errstring);
+                sx_close(s);
+
+                /* !!! drop queue */
 
                 return -1;
@@ -331 +333 @@
                 _sx_event(s, event_ERROR, (void *) &sxe);
 
-                _sx_error(s, stream_err_INTERNAL_SERVER_ERROR, errstring);
-                _sx_close(s);
+                sx_error(s, stream_err_INTERNAL_SERVER_ERROR, errstring);
+                sx_close(s);
 
                 /* !!! drop queue */
@@ -464 +466 @@
                 _sx_event(s, event_ERROR, (void *) &sxe);
 
-                _sx_error(s, stream_err_INTERNAL_SERVER_ERROR, errstring);
-                _sx_close(s);
+                sx_error(s, stream_err_INTERNAL_SERVER_ERROR, errstring);
+                sx_close(s);
 
                 /* !!! drop queue */