Re: svn commit: r468373 - in /httpd/httpd/trunk: CHANGES modules/cache/mod_cache.c modules/cache/mod_cache.h modules/cache/mod_disk_cache.c modules/cache/mod_disk_cache.h modules/cache/mod_mem_cache.c

On 10/27/2006 03:28 PM, minfrin <at> apache.org wrote:
> Author: minfrin
> Date: Fri Oct 27 06:28:56 2006
> New Revision: 468373
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=468373
> Log:
> mod_cache: Pass the output filter stack through the store_body()
> hook, giving each cache backend the ability to make a better
> decision as to how it will allocate the tasks of writing to the
> cache and writing to the network. Previously the write to the
> cache task needed to be complete before the same brigade was
> written to the network, and this caused timing and memory issues
> on large cached files. This fix replaces the previous fix for
> PR39380.
> 

> 
> Modified: httpd/httpd/trunk/modules/cache/mod_disk_cache.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_disk_cache.c?view=diff&rev=468373&r1=468372&r2=468373
> ==============================================================================
> --- httpd/httpd/trunk/modules/cache/mod_disk_cache.c (original)
> +++ httpd/httpd/trunk/modules/cache/mod_disk_cache.c Fri Oct 27 06:28:56 2006

>  <at>  <at>  -1286,9 +1292,15  <at>  <at> 
>  static apr_status_t open_new_file(request_rec *r, const char *filename,
>                                    apr_file_t **fd, disk_cache_conf *conf)
>  {
> -    int flags = APR_CREATE | APR_WRITE | APR_BINARY | APR_BUFFERED | APR_EXCL;

Re: svn commit: r468373 - in /httpd/httpd/trunk: CHANGES modules/cache/mod_cache.c modules/cache/mod_cache.h modules/cache/mod_disk_cache.c modules/cache/mod_disk_cache.h modules/cache/mod_mem_cache.c

On Wed, November 1, 2006 2:51 pm, Ruediger Pluem wrote:

> This breaks compilation of mod_disk_cache on systems that have
> APR_HAS_SENDFILE set.

This was fixed in a commit shortly after.

Regards,
Graham
--

Re: svn commit: r468373 - in /httpd/httpd/trunk: CHANGES modules/cache/mod_cache.c modules/cache/mod_cache.h modules/cache/mod_disk_cache.c modules/cache/mod_disk_cache.h modules/cache/mod_mem_cache.c

On 11/01/2006 02:30 PM, Graham Leggett wrote:
> On Wed, November 1, 2006 2:51 pm, Ruediger Pluem wrote:
> 
> 
>>This breaks compilation of mod_disk_cache on systems that have
>>APR_HAS_SENDFILE set.
> 
> 
> This was fixed in a commit shortly after.

I have svn up to the latest revision and it is not fixed.
If you still think that it is fixed please point me to the revision
that should have fixed it and I will have a look if something is wrong
on my side.

Regards

Rüdiger

Re: svn commit: r468373 - in /httpd/httpd/trunk: CHANGES modules/cache/mod_cache.c modules/cache/mod_cache.h modules/cache/mod_disk_cache.c modules/cache/mod_disk_cache.h modules/cache/mod_mem_cache.c

On Wed, November 1, 2006 5:48 pm, Ruediger Pluem wrote:

> I have svn up to the latest revision and it is not fixed.
> If you still think that it is fixed please point me to the revision
> that should have fixed it and I will have a look if something is wrong
> on my side.

If you do an svn log on that file it should give you the revision.

The problem came about when the line that initialises pconf was deleted to
remove a compiler warning - it needed to be there in the APR_HAS_SENDFILE
case  but wasn't surrounded in an #if. It was put back, and surrounded
with an #if.

Can you post the compile error?

Regards,
Graham
--

Re: svn commit: r468373 - in /httpd/httpd/trunk: CHANGES modules/cache/mod_cache.c modules/cache/mod_cache.h modules/cache/mod_disk_cache.c modules/cache/mod_disk_cache.h modules/cache/mod_mem_cache.c

On 11/01/2006 06:02 PM, Graham Leggett wrote:
> On Wed, November 1, 2006 5:48 pm, Ruediger Pluem wrote:
> 
> 
>>I have svn up to the latest revision and it is not fixed.
>>If you still think that it is fixed please point me to the revision
>>that should have fixed it and I will have a look if something is wrong
>>on my side.
> 
> 
> If you do an svn log on that file it should give you the revision.
> 
> The problem came about when the line that initialises pconf was deleted to
> remove a compiler warning - it needed to be there in the APR_HAS_SENDFILE
> case  but wasn't surrounded in an #if. It was put back, and surrounded
> with an #if.

The problem is that pconf is not declared.

> 
> Can you post the compile error?

Sure:

make[3]: Verlassen des Verzeichnisses »/usr/src/apache/httpd-trunk/modules/aaa«
make[2]: Verlassen des Verzeichnisses »/usr/src/apache/httpd-trunk/modules/aaa«
Making install in cache
make[2]: Wechsel in das Verzeichnis »/usr/src/apache/httpd-trunk/modules/cache«
make[3]: Wechsel in das Verzeichnis »/usr/src/apache/httpd-trunk/modules/cache«

[STATUS] (httpd-trunk) Wed Nov 1 23:52:21 2006

APACHE 2.3 STATUS:                                              -*-text-*-
Last modified at [$Date: 2006-08-22 16:41:03 -0400 (Tue, 22 Aug 2006) $]

The current version of this file can be found at:

  * http://svn.apache.org/repos/asf/httpd/httpd/trunk/STATUS

Documentation status is maintained seperately and can be found at:

  * docs/STATUS in this source tree, or
  * http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/STATUS

Consult the following STATUS files for information on related projects:

  * http://svn.apache.org/repos/asf/apr/apr/trunk/STATUS
  * http://svn.apache.org/repos/asf/apr/apr-util/trunk/STATUS

Patches considered for backport are noted in their branches' STATUS:

  * http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x/STATUS
  * http://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x/STATUS
  * http://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x/STATUS

Release history:
    [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
          while x.{even}.z versions are Stable/GA releases.]

    2.3.0   : in development

Contributors looking for a mission:

[STATUS] (httpd-2.0) Wed Nov 1 23:53:56 2006

APACHE 2.0 STATUS:                                              -*-text-*-
Last modified at [$Date: 2006-09-13 15:45:30 -0400 (Wed, 13 Sep 2006) $]

The current version of this file can be found at:

  * http://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x/STATUS

Documentation status is maintained seperately and can be found at:

  * docs/STATUS in this source tree, or
  * http://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x/docs/STATUS

Consult the following STATUS files for information on related projects:

  * http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x/STATUS
  * http://svn.apache.org/repos/asf/apr/apr-util/branches/0.9.x/STATUS

Consult the trunk/ for all new development and documentation efforts:

  * http://svn.apache.org/repos/asf/httpd/httpd/trunk/STATUS
  * http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/STATUS

Release history:

    2.0.60  : in maintenance
    2.0.59  : tagged July 27, 2006
    2.0.58  : released May 1, 2006 as GA. 
    2.0.57  : tagged April 19, 2006, not released.
    2.0.56  : tagged April 16, 2006, not released.
    2.0.55  : released October 16, 2005 as GA.

Win x64 build targets?

Hi all,
  I just upgraded to a new PC with EM64T enabled, and got WinXP x64
edition, VS 2003 and a 64-bit-enabled version of the Windows SDK.  I
wanted to try building native 64-bit builds of httpd 2.2.3.

APR seems to compile everything, but on linking I get the following error:

        link.exe  <at> C:\DOCUME~1\issac\LOCALS~1\Temp\nm10.tmp
.\Release\apr_atomic.obj : fatal error LNK1112: module machine type
'AMD64' conflicts with target machine type 'X86'
NMAKE : fatal error U1077: 'link.exe' : return code '0x458'
Stop.

Should this kind of build be possible?  Is there interest in building
"official" 64-bit binaries for windows platforms?  What can I do to help?

  Issac

[PATCH] mod_disk_cache fails to compile [Was: svn commit: r468373 - in /httpd/httpd/trunk: CHANGES modules/cache/mod_cache.c modules/cache/mod_cache.h modules/cache/mod_disk_cache.c modules/cache/mod_disk_cache.h modules/cache/mod_mem_cache.c]

On Fri, Oct 27, 2006 at 05:05:29PM +0200, Graham Leggett wrote:
> On Fri, October 27, 2006 4:38 pm, Davi Arnaut wrote:
> 
> > Where is pdconf ? Check out all those APR_HAS_SENDFILE.
> 
> Aaargh... will fix.

Still, since 2 days, again mod_disk_cache fails to compile on
platforms with sendfile (e.g., FreeBSD).

  Martin
--

-- 
<Martin.Kraemer <at> Fujitsu-Siemens.com>         |     Fujitsu Siemens
Fon: +49-89-636-46021, FAX: +49-89-636-48332 | 81730  Munich,  Germany

Index: modules/cache/mod_disk_cache.c
===================================================================
--- modules/cache/mod_disk_cache.c	(Revision 470318)
+++ modules/cache/mod_disk_cache.c	(Arbeitskopie)
 <at>  <at>  -1298,6 +1298,10  <at>  <at> 
 {
     int flags;
     apr_status_t rv;
+#if APR_HAS_SENDFILE
+    core_dir_config *pdconf = ap_get_module_config(r->per_dir_config,
+                                                   &core_module);
+#endif  

     flags = APR_CREATE | APR_WRITE | APR_READ | APR_BINARY | APR_BUFFERED | APR_EXCL | APR_TRUNCATE;

Re: [PATCH] mod_disk_cache fails to compile [Was: svn commit: r468373 - in /httpd/httpd/trunk: CHANGES modules/cache/mod_cache.c modules/cache/mod_cache.h modules/cache/mod_disk_cache.c modules/cache/mod_disk_cache.h modules/cache/mod_mem_cache.c]

On Thu, November 2, 2006 12:34 pm, Martin Kraemer wrote:

> Still, since 2 days, again mod_disk_cache fails to compile on
> platforms with sendfile (e.g., FreeBSD).

Is r468409 present in your tree?

Unfortunately I don't have a FreeBSD box, and so cannot reproduce the
problem. If you can send more details, I can get to the bottom of it -
"fails to compile" doesn't tell me anything useful.

Regards,
Graham
--

Index: modules/cache/mod_disk_cache.c
===================================================================
--- modules/cache/mod_disk_cache.c      (revision 468408)
+++ modules/cache/mod_disk_cache.c      (revision 468409)
 <at>  <at>  -720,6 +720,10  <at>  <at> 
     apr_time_t starttime = apr_time_now();
     int flags;
     apr_status_t rc;
+#if APR_HAS_SENDFILE
+    core_dir_config *pdconf = ap_get_module_config(r->per_dir_config,
+                                                   &core_module);
+#endif

     flags = APR_READ|APR_BINARY|APR_BUFFERED;
 #if APR_HAS_SENDFILE