Commit 6a415d08 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

* 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
parent 6a407588
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
                                                         -*- 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]
+0 −10
Original line number Diff line number Diff line
@@ -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
+3 −0
Original line number Diff line number Diff line
@@ -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