X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_http_file.cpp;h=e021b0347ad689b2022e24fc58784ea056747dfa;hb=6d37b7dda0348943459c50c0cfedf271b3722bb0;hp=d8cc4fba9b0aea8f64f2242816ae30bb3fc9b195;hpb=d0123337d70b0fb97b578cc57467bb94980f1014;p=metaproxy-moved-to-github.git

diff --git a/src/filter_http_file.cpp b/src/filter_http_file.cpp
index d8cc4fb..e021b03 100644
--- a/src/filter_http_file.cpp
+++ b/src/filter_http_file.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2009 Index Data
+   Copyright (C) 2005-2011 Index Data
 
 Metaproxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -17,9 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "config.hpp"
-#include "filter.hpp"
-#include "package.hpp"
-#include "util.hpp"
+#include <metaproxy/filter.hpp>
+#include <metaproxy/package.hpp>
+#include <metaproxy/util.hpp>
 #include "filter_http_file.hpp"
 
 #include <yaz/zgdu.h>
@@ -158,7 +158,13 @@ void yf::HttpFile::Rep::fetch_file(mp::Session &session,
     Z_HTTP_Response *hres = gdu->u.HTTP_Response;
     hres->content_len = sz;
     hres->content_buf = (char*) odr_malloc(o, hres->content_len);
-    fread(hres->content_buf, 1, hres->content_len, f);
+    if (fread(hres->content_buf, hres->content_len, 1, f) != 1)
+    {
+        fclose(f);
+        Z_GDU *gdu = o.create_HTTP_Response(session, req, 500);
+        package.response() = gdu;
+        return;
+    }
 
     fclose(f);