[Pkg-ocaml-maint-commits] [SCM] approx upstream and debian packaging branch, upstream, updated. upstream/3.5-46-gd97ea77

[Eric Cooper]

The following commit has been merged in the upstream branch:
commit 96355f9d1a0c4f35a267378b0aa47b15bd920c05
Author: Eric Cooper <ecc at cmu.edu>
Date:   Fri Jun 25 12:54:12 2010 -0400

    fix duplicate function name

diff --git a/approx.ml b/approx.ml
index 253acdf..c6ffa81 100644
--- a/approx.ml
+++ b/approx.ml
@@ -472,7 +472,7 @@ let serve_file env =
         | Cache_miss mod_time -> cache_miss url name ims mod_time
     with e -> server_error e
 
-let process_header env =
+let process_request env =
   debug_message "Connection from %s"
     (string_of_sockaddr env#remote_socket_addr ~with_port: true);
   let meth = env#cgi_request_method in
@@ -515,7 +515,7 @@ let proxy_service =
     method name = "proxy_service"
     method def_term = `Proxy_service
     method print fmt = Format.fprintf fmt "%s" "proxy_service"
-    method process_header = process_header
+    method process_header = process_request
   end
 
 let approx () =

-- 
approx upstream and debian packaging