wrowe | 1 Apr 2010 06:24
Picon
Favicon

svn commit: r119 - in /release/httpd: httpd-2.2.15-win32-src-r2.zip httpd-2.2.15-win32-src-r2.zip.asc httpd-2.2.15-win32-src-r2.zip.md5 httpd-2.2.15-win32-src-r2.zip.sha1

Author: wrowe
Date: Thu Apr  1 00:24:34 2010
New Revision: 119

Log:
Add a replacement win32 src package without the .dep bug

Added:
    release/httpd/httpd-2.2.15-win32-src-r2.zip   (with props)
    release/httpd/httpd-2.2.15-win32-src-r2.zip.asc   (with props)
    release/httpd/httpd-2.2.15-win32-src-r2.zip.md5   (with props)
    release/httpd/httpd-2.2.15-win32-src-r2.zip.sha1   (with props)

Added: release/httpd/httpd-2.2.15-win32-src-r2.zip
==============================================================================
Binary file - no diff available.

Propchange: release/httpd/httpd-2.2.15-win32-src-r2.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: release/httpd/httpd-2.2.15-win32-src-r2.zip.asc
==============================================================================
--- release/httpd/httpd-2.2.15-win32-src-r2.zip.asc (added)
+++ release/httpd/httpd-2.2.15-win32-src-r2.zip.asc Thu Apr  1 00:24:34 2010
 <at>  <at>  -0,0 +1,17  <at>  <at> 
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (MingW32)
+
+iQIcBAABAgAGBQJLtB9/AAoJEKNIuYR/chSnu6gQAJPLWGQW41Q4ABfjCFT3jyXE
(Continue reading)

wrowe | 1 Apr 2010 06:32
Picon
Favicon

svn commit: r929814 - /httpd/site/trunk/xdocs/download.xml

Author: wrowe
Date: Thu Apr  1 04:32:00 2010
New Revision: 929814

URL: http://svn.apache.org/viewvc?rev=929814&view=rev
Log:
Reflect -r2 for win32 packages

Modified:
    httpd/site/trunk/xdocs/download.xml

Modified: httpd/site/trunk/xdocs/download.xml
URL: http://svn.apache.org/viewvc/httpd/site/trunk/xdocs/download.xml?rev=929814&r1=929813&r2=929814&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/download.xml [utf-8] (original)
+++ httpd/site/trunk/xdocs/download.xml [utf-8] Thu Apr  1 04:32:00 2010
 <at>  <at>  -98,11 +98,11  <at>  <at>  by the project, and is recommended over 
 </li>

 <li>Win32 Source: 
-<a href="[preferred]/httpd/httpd-2.2.15-win32-src.zip"
-  >httpd-2.2.15-win32-src.zip</a>
-[<a href="http://www.apache.org/dist/httpd/httpd-2.2.15-win32-src.zip.asc">PGP</a>]
-[<a href="http://www.apache.org/dist/httpd/httpd-2.2.15-win32-src.zip.md5">MD5</a>]
-[<a href="http://www.apache.org/dist/httpd/httpd-2.2.15-win32-src.zip.sha1">SHA1</a>]
+<a href="[preferred]/httpd/httpd-2.2.15-win32-src-r2.zip"
+  >httpd-2.2.15-win32-src-r2.zip</a>
+[<a href="http://www.apache.org/dist/httpd/httpd-2.2.15-win32-src-r2.zip.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/httpd/httpd-2.2.15-win32-src-r2.zip.md5">MD5</a>]
+[<a href="http://www.apache.org/dist/httpd/httpd-2.2.15-win32-src-r2.zip.sha1">SHA1</a>]
(Continue reading)

drh | 1 Apr 2010 20:47
Picon
Favicon

svn commit: r930063 - /httpd/httpd/trunk/modules/ssl/ssl_util.c

Author: drh
Date: Thu Apr  1 18:47:27 2010
New Revision: 930063

URL: http://svn.apache.org/viewvc?rev=930063&view=rev
Log:
Free surrounding PKCS7 structure to avoid a leak.

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_util.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util.c?rev=930063&r1=930062&r2=930063&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_util.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_util.c Thu Apr  1 18:47:27 2010
 <at>  <at>  -302,10 +302,14  <at>  <at>  STACK_OF(X509) *ssl_read_pkcs7(server_re
     switch (OBJ_obj2nid(p7->type)) {
     case NID_pkcs7_signed:
         certs = p7->d.sign->cert;
+        p7->d.sign->cert = NULL;
+        PKCS7_free(p7);
         break;

     case NID_pkcs7_signedAndEnveloped:
         certs = p7->d.signed_and_enveloped->cert;
+        p7->d.signed_and_enveloped->cert = NULL;
+        PKCS7_free(p7);
         break;

(Continue reading)

drh | 1 Apr 2010 20:56
Picon
Favicon

svn commit: r930064 - /httpd/httpd/branches/2.2.x/STATUS

Author: drh
Date: Thu Apr  1 18:56:21 2010
New Revision: 930064

URL: http://svn.apache.org/viewvc?rev=930064&view=rev
Log:
vote on SSLFIPS and comment on PKCS#7.

Modified:
    httpd/httpd/branches/2.2.x/STATUS

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=930064&r1=930063&r2=930064&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Apr  1 18:56:21 2010
 <at>  <at>  -145,6 +145,7  <at>  <at>  PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     +1: wrowe
     minfrin: Doesn't build on v2.2 until you add r926614. With r926614, +1.
     wrowe: Added both of rpluem's proposed patched, 926614 and 926619
+    +1: drh

 PATCHES/ISSUES THAT ARE STALLED

 <at>  <at>  -228,6 +229,7  <at>  <at>  PATCHES/ISSUES THAT ARE STALLED
               need to be added to this. See also
               http://mail-archives.apache.org/mod_mbox/httpd-dev/200607.mbox/%3c20060723093125.GA19423 <at> redhat.com%3e
               and follow ups for more details.
+      needs r930063 to avoid a memory leak, +1 with r930063.      

(Continue reading)

pgollucci | 1 Apr 2010 22:32
Picon
Favicon

svn commit: r930080 - /httpd/httpd/trunk/STATUS

Author: pgollucci
Date: Thu Apr  1 20:32:18 2010
New Revision: 930080

URL: http://svn.apache.org/viewvc?rev=930080&view=rev
Log:
vote

Modified:
    httpd/httpd/trunk/STATUS

Modified: httpd/httpd/trunk/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/STATUS?rev=930080&r1=930079&r2=930080&view=diff
==============================================================================
--- httpd/httpd/trunk/STATUS (original)
+++ httpd/httpd/trunk/STATUS Thu Apr  1 20:32:18 2010
 <at>  <at>  -85,7 +85,7  <at>  <at>  CURRENT VOTES:

     Self-destruct: Ken, Martin, Lars
     Not self-destruct: BrianP, Ian, Cliff, BillS
-    Make it runtime configurable: Aaron, jim, Justin, wrowe, rederpj, nd
+    Make it runtime configurable: Aaron, jim, Justin, wrowe, rederpj, nd, pgollucci

     /* The below was a concept on *how* to handle the problem */
     Have 2 parents: +1: jim

pgollucci | 1 Apr 2010 22:35
Picon
Favicon

svn commit: r930082 - /httpd/httpd/branches/2.2.x/STATUS

Author: pgollucci
Date: Thu Apr  1 20:35:30 2010
New Revision: 930082

URL: http://svn.apache.org/viewvc?rev=930082&view=rev
Log:
vote

Modified:
    httpd/httpd/branches/2.2.x/STATUS

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=930082&r1=930081&r2=930082&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Apr  1 20:35:30 2010
 <at>  <at>  -115,7 +115,7  <at>  <at>  PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     Trunk patch: http://svn.apache.org/viewvc?rev=921347&view=rev
                  http://svn.apache.org/viewvc?rev=921583&view=rev
     2.2.x patch: Trunk patch works
-    +1: sf
+    +1: sf, pgollucci

   * mod_ssl: modules/ssl/ssl_engine_init.c (ssl_init_ctx_cleanup_proxy):
     Unset pkp->certs pointer after freeing the array; fixes segfault at

niq | 2 Apr 2010 00:48
Picon
Favicon
Gravatar

svn commit: r930125 - in /httpd/httpd/trunk: CHANGES modules/proxy/mod_proxy.c modules/proxy/mod_proxy.h modules/proxy/mod_proxy_balancer.c

Author: niq
Date: Thu Apr  1 22:48:38 2010
New Revision: 930125

URL: http://svn.apache.org/viewvc?rev=930125&view=rev
Log:
Proxy balancer: support setting error status according to
HTTP response code from a backend.
PR 48939 [Daniel Ruggeri <DRuggeri primary.net>]

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/proxy/mod_proxy.c
    httpd/httpd/trunk/modules/proxy/mod_proxy.h
    httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=930125&r1=930124&r2=930125&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Thu Apr  1 22:48:38 2010
 <at>  <at>  -28,6 +28,10  <at>  <at>  Changes with Apache 2.3.7
      processing is completed, avoiding orphaned callback pointers.
      [Brett Gervasoni <brettg senseofsecurity.com>, Jeff Trawick]

+  *) Proxy balancer: support setting error status according to
+     HTTP response code from a backend.
+     PR 48939 [Daniel Ruggeri <DRuggeri primary.net>]
+
   *) htcacheclean: Introduce the ability to clean specific URLs from the
(Continue reading)

drh | 2 Apr 2010 01:09
Picon
Favicon

svn commit: r930131 - /httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c

Author: drh
Date: Thu Apr  1 23:09:11 2010
New Revision: 930131

URL: http://svn.apache.org/viewvc?rev=930131&view=rev
Log:
Code tidy, certificate extension decode can be done with the single
function X509_get_ext_d2i().

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c?rev=930131&r1=930130&r2=930131&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c Thu Apr  1 23:09:11 2010
 <at>  <at>  -292,26 +292,22  <at>  <at>  char *SSL_make_ciphersuite(apr_pool_t *p
 BOOL SSL_X509_isSGC(X509 *cert)
 {
 #ifdef HAVE_SSL_X509V3_EXT_d2i
-    X509_EXTENSION *ext;
     int ext_nid;
     EXTENDED_KEY_USAGE *sk;
     BOOL is_sgc;
-    int idx;
     int i;

     is_sgc = FALSE;
-    idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1);
(Continue reading)

trawick | 2 Apr 2010 14:19
Picon
Favicon

svn commit: r930254 - in /httpd/httpd/trunk: CHANGES modules/proxy/mod_proxy.c modules/proxy/mod_proxy_balancer.c

Author: trawick
Date: Fri Apr  2 12:19:22 2010
New Revision: 930254

URL: http://svn.apache.org/viewvc?rev=930254&view=rev
Log:
small style tweaks to r930125

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/proxy/mod_proxy.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=930254&r1=930253&r2=930254&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Apr  2 12:19:22 2010
 <at>  <at>  -28,9 +28,8  <at>  <at>  Changes with Apache 2.3.7
      processing is completed, avoiding orphaned callback pointers.
      [Brett Gervasoni <brettg senseofsecurity.com>, Jeff Trawick]

-  *) Proxy balancer: support setting error status according to
-     HTTP response code from a backend.
-     PR 48939 [Daniel Ruggeri <DRuggeri primary.net>]
+  *) Proxy balancer: support setting error status according to HTTP response
+     code from a backend.  PR 48939.  [Daniel Ruggeri <DRuggeri primary.net>]

   *) htcacheclean: Introduce the ability to clean specific URLs from the
      cache, if provided as an optional parameter on the command line.
(Continue reading)

rbowen | 4 Apr 2010 03:28
Picon
Favicon

svn commit: r930606 [1/2] - in /httpd/httpd/trunk/docs/manual/mod: core.html.en core.xml.de core.xml.ja core.xml.tr directives.html.en quickreference.html.en

Author: rbowen
Date: Sun Apr  4 01:28:18 2010
New Revision: 930606

URL: http://svn.apache.org/viewvc?rev=930606&view=rev
Log:
Rebuild various transformations.

Modified:
    httpd/httpd/trunk/docs/manual/mod/core.html.en
    httpd/httpd/trunk/docs/manual/mod/core.xml.de
    httpd/httpd/trunk/docs/manual/mod/core.xml.ja
    httpd/httpd/trunk/docs/manual/mod/core.xml.tr
    httpd/httpd/trunk/docs/manual/mod/directives.html.en
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.en

Modified: httpd/httpd/trunk/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.html.en?rev=930606&r1=930605&r2=930606&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.en Sun Apr  4 01:28:18 2010
 <at>  <at>  -61,7 +61,6  <at>  <at>  available</td></tr>
 <li><img alt="" src="../images/down.gif" /> <a href="#ifdefine">&lt;IfDefine&gt;</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ifmodule">&lt;IfModule&gt;</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#include">Include</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#includestrict">IncludeStrict</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#keepalive">KeepAlive</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#keepalivetimeout">KeepAliveTimeout</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#limit">&lt;Limit&gt;</a></li>
 <at>  <at>  -1574,8 +1573,7  <at>  <at>  later.</td></tr>
(Continue reading)


Gmane