Public MP headers in include/metaproxy

[metaproxy-moved-to-github.git] / src / filter_http_file.cpp

diff --git a/src/filter_http_file.cpp b/src/filter_http_file.cpp
index e0b132c..f9dfb42 100644 (file)
--- a/src/filter_http_file.cpp
+++ b/src/filter_http_file.cpp
@@ -1,7 +1,5 @@
-/* $Id: filter_http_file.cpp,v 1.9 2007-05-09 21:23:09 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2010 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
@@ -14,15 +12,14 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Metaproxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+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>
@@ -161,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);
     
@@ -215,7 +218,7 @@ void yf::HttpFile::process(mp::Package &package) const
         package.move();
 }
 
-void mp::filter::HttpFile::configure(const xmlNode * ptr)
+void mp::filter::HttpFile::configure(const xmlNode * ptr, bool test_only)
 {
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
@@ -293,8 +296,9 @@ extern "C" {
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+