httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1433393 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS support/htcacheclean.c
Date Tue, 15 Jan 2013 13:19:29 GMT
Author: rjung
Date: Tue Jan 15 13:19:28 2013
New Revision: 1433393

URL: http://svn.apache.org/viewvc?rev=1433393&view=rev
Log:
htcacheclean: Fix list options "-a" and "-A".

Without the fix output is empty because there's no filetype
without APR_FINFO_TYPE.
The options are new in 2.4.

Backport of r1433001 from trunk.

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/support/htcacheclean.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1433001

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1433393&r1=1433392&r2=1433393&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Jan 15 13:19:28 2013
@@ -2,11 +2,14 @@
 
 Changes with Apache 2.4.4
 
-  * mod_slotmem_shm: Fix mistaken reset of num_free for restored shm.
-    [Jim Jagielski]
+  *) htcacheclean: Fix list options "-a" and "-A".
+     [Rainer Jung]
+
+  *) mod_slotmem_shm: Fix mistaken reset of num_free for restored shm.
+     [Jim Jagielski]
 
-  * mod_proxy: non-existance of byrequests is not an immediate error.
-    [Jim Jagielski]
+  *) mod_proxy: non-existance of byrequests is not an immediate error.
+     [Jim Jagielski]
 
   *) mod_proxy_balancer: Improve output of balancer-manager (re: Drn,
      Dis, Ign, Stby). PR 52478 [Danijel <dt-ng rbfh de>]

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1433393&r1=1433392&r2=1433393&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Jan 15 13:19:28 2013
@@ -92,15 +92,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
-  * htcacheclean: Fix list options "-a" and "-A".
-    Without the fix output is empty because there's no filetype
-    without APR_FINFO_TYPE.
-    One line fix.  The options are new in 2.4.
-    trunk patch: http://svn.apache.org/r1433001
-    2.4.x patch: trunk patch works (plus CHANGES)
-    +1: rjung, minfrin, humbedooh
-    
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

Modified: httpd/httpd/branches/2.4.x/support/htcacheclean.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/support/htcacheclean.c?rev=1433393&r1=1433392&r2=1433393&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/support/htcacheclean.c (original)
+++ httpd/httpd/branches/2.4.x/support/htcacheclean.c Tue Jan 15 13:19:28 2013
@@ -421,7 +421,7 @@ static int list_urls(char *path, apr_poo
         return 1;
     }
 
-    while (apr_dir_read(&info, 0, dir) == APR_SUCCESS && !interrupted) {
+    while (apr_dir_read(&info, APR_FINFO_TYPE, dir) == APR_SUCCESS && !interrupted)
{
 
         if (info.filetype == APR_DIR) {
             if (!strcmp(info.name, ".") || !strcmp(info.name, "..")) {



Mime
View raw message