[bcm63xx] base-files: Added network defconfig because board only has one ethernet...

[openwrt.git] / package / uhttpd / src / uhttpd.c

diff --git a/package/uhttpd/src/uhttpd.c b/package/uhttpd/src/uhttpd.c
index 6f5e616..491452b 100644 (file)
--- a/package/uhttpd/src/uhttpd.c
+++ b/package/uhttpd/src/uhttpd.c
@@ -401,6 +401,10 @@ static struct http_request * uh_http_header_recv(struct client *cl)
                        {
                                ensure_out(rlen = uh_tcp_recv(cl, bufptr, rlen));
 
                        {
                                ensure_out(rlen = uh_tcp_recv(cl, bufptr, rlen));
 

+                               /* unexpected eof - #7904 */
+                               if( rlen == 0 )
+                                       return NULL;
+

                                blen -= rlen;
                                bufptr += rlen;
                        }
                                blen -= rlen;
                                bufptr += rlen;
                        }


@@ -562,7 +566,7 @@ static void uh_mainloop(struct config *conf, fd_set serv_fds, int max_fd)
                                                if( (pin = uh_path_lookup(cl, req->url)) != NULL )
                                                {
                                                        /* auth ok? */
                                                if( (pin = uh_path_lookup(cl, req->url)) != NULL )
                                                {
                                                        /* auth ok? */

-                                                       if( uh_auth_check(cl, req, pin) )
+                                                       if( !pin->redirected && uh_auth_check(cl, req, pin) )

                                                                uh_dispatch_request(cl, req, pin);
                                                }
 
                                                                uh_dispatch_request(cl, req, pin);
                                                }
 


@@ -1085,4 +1089,3 @@ int main (int argc, char **argv)
 
        return 0;
 }
 
        return 0;
 }

-