From: Ben Laurie <ben@apache.org>
Date: Tue, 5 Oct 1999 11:57:41 +0000 (+0000)
Subject: Use new parameter orders.
X-Git-Tag: 1.3.10~305
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c3fd58a7ffcc61cee5bc458d69105ffdab7afbc;p=thirdparty%2Fapache%2Fhttpd.git

Use new parameter orders.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83934 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/generators/mod_asis.c b/modules/generators/mod_asis.c
index cd6c96cb1dc..9db8ced4aa8 100644
--- a/modules/generators/mod_asis.c
+++ b/modules/generators/mod_asis.c
@@ -114,7 +114,7 @@ static int asis_handler(request_rec *r)
     if (!r->header_only) {
         ap_off_t zero = 0;
 	ap_seek(f, APR_CUR, &zero);
-	ap_send_fd(thefd, r);
+	ap_send_fd(f, r);
     }
 
     ap_close(f);
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 1c2deeb2d72..478cacc5fdb 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -624,8 +624,8 @@ static void accept_mutex_init(ap_context_t *p)
 
     expand_lock_fname(p);
     unlink(ap_lock_fname);
-    ap_open(p, ap_lock_fname, APR_CREATE|APR_WRITE|APR_EXCL,
-	    APR_UREAD|APR_UWRITE, &tempfile);
+    ap_open(&tempfile, p, ap_lock_fname, APR_CREATE|APR_WRITE|APR_EXCL,
+	    APR_UREAD|APR_UWRITE);
     if (!tempfile) {
 	ap_log_error(APLOG_MARK, APLOG_EMERG, server_conf,
 		    "Parent cannot open lock file: %s", ap_lock_fname);