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 cd6c96cb1dcd5e67f2b6511f66dbcb420e95c7fe..9db8ced4aa8a4a8af5b559158cf551c87d5fa64c 100644 (file)
--- 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 1c2deeb2d72b12c9ca22860c89c87bb77749bf58..478cacc5fdbe348435de82b5e1ee9829bbb2c672 100644 (file)
--- 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);