* htdbm: Fix crash in 64-bit mode on HP-UX caused by unexpected

      placement of crypt() prototype (unistd.h).
        Trunk version of patch:
          http://svn.apache.org/viewcvs?rev=393364&view=rev

Orig: Jeff Trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@535858 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index c8307d8734e35326725ee65d8d3fe79c04f15b17..bc1891e81edd834704308ba7a89c5365b77f86a7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.0.60
 
+  *) htdbm: Fix crash processing -d option in 64-bit mode on HP-UX.
+     [Jeff Trawick]
+
   *) proxy_http.c: Overlay existing cookies with proxied ones, ala
      httpd-2.2. [Jim Jagielski]
 

diff --git a/STATUS b/STATUS
index e39d5281bb919789048e5be1a2397399504fc5cc..433972d5edf7551e35f03897b19502a009430d3f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -114,16 +114,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * htdbm: Fix crash in 64-bit mode on HP-UX caused by unexpected
-      placement of crypt() prototype (unistd.h).
-        Trunk version of patch:
-          http://svn.apache.org/viewcvs?rev=393364&view=rev
-        2.0.x version of patch:
-          Trunk version works
-      +1: trawick, wrowe, rpluem
-        wrowe adds; even if ineffective for some oddball machine, this
-                    patch is entirely harmless.
-
     * mod_ssl: Solve POST incompatible w/ renegotiate HTTPS connection
       (This was already committed to 2.2.x, and the reports persist.)
         http://issues.apache.org/bugzilla/show_bug.cgi?id=12355

diff --git a/support/htdbm.c b/support/htdbm.c
index a194f756096b7eff1e99aa1a25de359c43fb0715..db1d1378aea07d7261a35a68c9046f00682fdd01 100644 (file)
--- a/support/htdbm.c
+++ b/support/htdbm.c
@@ -48,6 +48,9 @@
 #include "apr_xlate.h"
 #endif /*APR_CHARSET_EBCDIC*/
 
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #if APR_HAVE_CRYPT_H
 #include <crypt.h>
 #endif