httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r535858 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS support/htdbm.c
Date Mon, 07 May 2007 11:39:42 GMT
Author: jim
Date: Mon May  7 04:39:41 2007
New Revision: 535858

URL: http://svn.apache.org/viewvc?view=rev&rev=535858
Log:
    * 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

Modified:
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/support/htdbm.c

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/CHANGES?view=diff&rev=535858&r1=535857&r2=535858
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Mon May  7 04:39:41 2007
@@ -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]
 

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/STATUS?view=diff&rev=535858&r1=535857&r2=535858
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Mon May  7 04:39:41 2007
@@ -114,16 +114,6 @@
 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

Modified: httpd/httpd/branches/2.0.x/support/htdbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/support/htdbm.c?view=diff&rev=535858&r1=535857&r2=535858
==============================================================================
--- httpd/httpd/branches/2.0.x/support/htdbm.c (original)
+++ httpd/httpd/branches/2.0.x/support/htdbm.c Mon May  7 04:39:41 2007
@@ -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



Mime
View raw message