diff options
author | Jim Jagielski <jim@apache.org> | 2007-05-07 11:39:41 +0000 |
---|---|---|
committer | Jim Jagielski <jim@apache.org> | 2007-05-07 11:39:41 +0000 |
commit | 9363e273d69e2b5c57bea07dc4af2b4e77823e5d (patch) | |
tree | ecb74cebeeb64dd5ee7181143562f3d8e95486b5 | |
parent | e38438c9828ce6f1b039299ec4a8ca531f68231f (diff) | |
download | httpd-9363e273d69e2b5c57bea07dc4af2b4e77823e5d.tar.gz |
* 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
-rw-r--r-- | CHANGES | 3 | ||||
-rw-r--r-- | STATUS | 10 | ||||
-rw-r--r-- | support/htdbm.c | 3 |
3 files changed, 6 insertions, 10 deletions
@@ -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] @@ -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 a194f75609..db1d1378ae 100644 --- 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 |