Changeset 2153

Timestamp:

04/23/2008 03:05:50 PM (5 months ago)

Author:

stbuehler

Message:

Handle EINTR in mod_cgi during write() (#1640)

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• src/mod_cgi.c (modified) (3 diffs)

branches/lighttpd-1.4.x/NEWS

@@ -19 +19 @@
   * Fix mod_fastcgi prefix matching: match the prefix always against url, not the absolute filepath (regardless of check-local)
   * Overwrite Content-Type header in mod_dirlisting instead of inserting (#1614), patch by Henrik Holst
+  * Handle EINTR in mod_cgi during write() (#1640)
 
 - 1.4.19 - 2008-03-10

branches/lighttpd-1.4.x/src/mod_cgi.c

@@ -1059 +1059 @@
                                                 case ENOSPC:
                                                         con->http_status = 507;
-
                                                         break;
+                                                case EINTR:
+                                                        continue;
                                                 default:
                                                         con->http_status = 403;
@@ -1072 +1073 @@
                                                 case ENOSPC:
                                                         con->http_status = 507;
-
                                                         break;
+                                                case EINTR:
+                                                        continue;
                                                 default:
                                                         con->http_status = 403;
@@ -1088 +1090 @@
                                         cq->bytes_out += r;
                                 } else {
+                                        log_error_write(srv, __FILE__, __LINE__, "ss", "write() failed due to: ", strerror(errno)); 
+                                        con->http_status = 500;
                                         break;
                                 }