headers
wrowe | 1 Mar 2006 07:48
Picon
Favicon

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

Author: wrowe
Date: Tue Feb 28 22:48:48 2006
New Revision: 381931

URL: http://svn.apache.org/viewcvs?rev=381931&view=rev
Log:

  Resubmit patch (can't demonstrate against trunk/ after refactoring),
  reset votes.

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

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=381931&r1=381930&r2=381931&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Feb 28 22:48:48 2006
 <at>  <at>  -148,14 +148,10  <at>  <at> 
       http://people.apache.org/~rpluem/patches/partial_2.2.diff
       +1: jim, rpluem, jerenkrantz

-    * Fix mis-shifted 32 bit scope, masked to 64 bits as a method.
-        URL: http://svn.apache.org/viewcvs?rev=358040&view=rev
-      +1: mturk
-      -0: jorton: should use AP_METHOD_BIT
-          wrowe asks; is this your desired patch?  Please vote;
--        if (! (reqs[x].method_mask & (1 << m))) {
-+        if (! (reqs[x].method_mask & (AP_METHOD_BIT << m))) {
-      +1: wrowe  (for flavor requested by jorton)
(Continue reading)

Permalink | Reply | 0 comments |
headers
wrowe | 1 Mar 2006 21:40
Picon
Favicon

svn commit: r382147 - /httpd/httpd/trunk/modules/filters/mod_include.c

Author: wrowe
Date: Wed Mar  1 12:40:25 2006
New Revision: 382147

URL: http://svn.apache.org/viewcvs?rev=382147&view=rev
Log:

  APR_FILEPATH_NOTABOVEROOT was undefined with a left-hand NULL
  or empty path.  The SECUREROOTPATH and NOTABSOLUTE tests were
  sufficient for this application.  Adjusts for a bug in earlier
  versions of APR with this undefined value.

Modified:
    httpd/httpd/trunk/modules/filters/mod_include.c

Modified: httpd/httpd/trunk/modules/filters/mod_include.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/filters/mod_include.c?rev=382147&r1=382146&r2=382147&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_include.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_include.c Wed Mar  1 12:40:25 2006
 <at>  <at>  -1539,7 +1539,6  <at>  <at> 

         /* be safe; only files in this directory or below allowed */
         rv = apr_filepath_merge(&newpath, NULL, tag_val,
-                                APR_FILEPATH_NOTABOVEROOT |
                                 APR_FILEPATH_SECUREROOTTEST |
                                 APR_FILEPATH_NOTABSOLUTE, r->pool);

 <at>  <at>  -1655,7 +1654,6  <at>  <at>
(Continue reading)

Permalink | Reply | 0 comments |
headers
wrowe | 1 Mar 2006 21:43
Picon
Favicon

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

Author: wrowe
Date: Wed Mar  1 12:43:12 2006
New Revision: 382148

URL: http://svn.apache.org/viewcvs?rev=382148&view=rev
Log:

  Coexist with multiple releases of APR, we only promise to die
  using APR 1.1 and earlier.

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

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=382148&r1=382147&r2=382148&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Mar  1 12:43:12 2006
 <at>  <at>  -164,3 +164,11  <at>  <at> 
         http://svn.apache.org/viewcvs?rev=379562&view=rev
       +1: trawick, jerenkrantz, jorton

+    * mod_include:  APR_FILEPATH_NOTABOVEROOT was undefined with
+      a left-hand NULL or empty path.  The SECUREROOTPATH and 
+      NOTABSOLUTE tests are sufficient for this application.  
+      Adjust for this bug in earlier versions of APR that mishandled
+      the NOTABOVEROOT flag with an empty left hand value.
+        http://svn.apache.org/viewcvs?rev=382147&view=rev
+      +1: wrowe
+
(Continue reading)

Permalink | Reply | 0 comments |
headers
bnicholes | 2 Mar 2006 16:58
Picon
Favicon

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

Author: bnicholes
Date: Thu Mar  2 07:58:50 2006
New Revision: 382424

URL: http://svn.apache.org/viewcvs?rev=382424&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/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=382424&r1=382423&r2=382424&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Mar  2 07:58:50 2006
 <at>  <at>  -113,6 +113,8  <at>  <at> 
     * Backport mod_authz_dbd (it's had some testing now)
       http://svn.apache.org/viewcvs.cgi/httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c
       +1 niq
+      -1 bnicholes - The authorization refactoring that was done is for 2.3 and above.
+                     This can not be backported to 2.2.

     * mod_proxy: Correctly error out if we get an error from upstream
       response.  Otherwise, we'll leave the client in a bad state.
 <at>  <at>  -170,5 +172,5  <at>  <at> 
       Adjust for this bug in earlier versions of APR that mishandled
       the NOTABOVEROOT flag with an empty left hand value.
         http://svn.apache.org/viewcvs?rev=382147&view=rev
-      +1: wrowe
(Continue reading)

Permalink | Reply | 0 comments |
headers
jorton | 3 Mar 2006 14:11
Picon
Favicon

svn commit: r382799 - /httpd/httpd/trunk/modules/ssl/ssl_scache_shmcb.c

Author: jorton
Date: Fri Mar  3 05:11:39 2006
New Revision: 382799

URL: http://svn.apache.org/viewcvs?rev=382799&view=rev
Log:
* modules/ssl/ssl_scache_shmcb.c (shmcb_safe_clear): Mark with
"noinline" attribute for GCC > 3.

PR: 38838

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

Modified: httpd/httpd/trunk/modules/ssl/ssl_scache_shmcb.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ssl/ssl_scache_shmcb.c?rev=382799&r1=382798&r2=382799&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_scache_shmcb.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_scache_shmcb.c Fri Mar  3 05:11:39 2006
 <at>  <at>  -234,8 +234,13  <at>  <at> 
                         (const unsigned char *)(&tmp_time)); \
         } while(0)

-/* This is necessary simply so that the size passed to memset() is not a
- * compile-time constant, preventing the compiler from optimising it. */
+/* This is used to persuade the compiler from using an inline memset()
+ * which has no respect for alignment, since the size parameter is
+ * often a compile-time constant.  GCC >= 4 will aggressively inline
+ * static functions, so it's marked as explicitly not-inline. */
+#if defined(__GNUC__) && __GNUC__ > 3
(Continue reading)

Permalink | Reply | 2 comments |
headers
rooneg | 5 Mar 2006 01:57
Picon
Favicon

svn commit: r383239 - /httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c

Author: rooneg
Date: Sat Mar  4 16:57:24 2006
New Revision: 383239

URL: http://svn.apache.org/viewcvs?rev=383239&view=rev
Log:
Bring the debugging output up to date with the kind of things that are
actually being debugged at the moment.  Also note a problem with the way
we handle the path info setup.

* modules/proxy/mod_proxy_fcgi.c
  (proxy_fcgi_canon): Log the filename and path info when we set them,
   add a note that the path info stuff isn't being set if we're run in
   a balancer setup, which needs to be fixed somehow.
  (send_environment): Add an (ifdefed) call to log the environment vars
   we send to the backend server.
  (dump_header_to_log): Default to ifdefing this out, we're a bit beyond
   bugs in the raw FCGI protocol at this point and it fills up the logs.

Modified:
    httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c

Modified: httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c?rev=383239&r1=383238&r2=383239&view=diff
==============================================================================
--- httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c (original)
+++ httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c Sat Mar  4 16:57:24 2006
 <at>  <at>  -110,8 +110,19  <at>  <at> 
     r->filename = apr_pstrcat(r->pool, "proxy:fcgi://", host, sport, "/",
                               path, NULL);
(Continue reading)

Permalink | Reply | 0 comments |
headers
rooneg | 5 Mar 2006 05:33
Picon
Favicon

svn commit: r383278 - /httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c

Author: rooneg
Date: Sat Mar  4 20:33:44 2006
New Revision: 383278

URL: http://svn.apache.org/viewcvs?rev=383278&view=rev
Log:
Stop holding open connections to the backend fastcgi processes.  At
this point we lack a good way to manage them, and thus it's really
easy to end up with situations where you get weird timeouts because
other worker process are holding all the connections open.

This allows Rails applications to reliably work with mod_proxy_fcgi.

* modules/proxy/mod_proxy_fcgi.c
  (dispatch): Add a timeout for our poll.  This should be controlled
   by a config option of some sort, but for now just hardcode it.
  (proxy_fcgi_handler): Set close_on_recycle to 1, so we don't hold
   open connections to the fastcgi processes.

Modified:
    httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c

Modified: httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c?rev=383278&r1=383277&r2=383278&view=diff
==============================================================================
--- httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c (original)
+++ httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c Sat Mar  4 20:33:44 2006
 <at>  <at>  -527,7 +527,8  <at>  <at> 
         apr_size_t len;
         int n;
(Continue reading)

Permalink | Reply | 0 comments |
headers
rooneg | 5 Mar 2006 08:08
Picon
Favicon

svn commit: r383291 - in /httpd/httpd/branches/fcgi-proxy-dev/modules/proxy: mod_proxy_balancer.c mod_proxy_fcgi.c

Author: rooneg
Date: Sat Mar  4 23:08:28 2006
New Revision: 383291

URL: http://svn.apache.org/viewcvs?rev=383291&view=rev
Log:
Fix up the path info in the balancer backend just like we do in the
fcgi backend.  This lets Rails apps work under a balancer setup without
any hacks to Rails itself.

* modules/proxy/mod_proxy_balancer.c
  (proxy_balancer_canon): Set r->path_info based on the path we got
   from parsing the URL.

* modules/proxy/mod_proxy_fcgi.c
  (proxy_fcgi_canon): Remove the comment about balancer not setting
   the path_info.

Modified:
    httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_balancer.c
    httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c

Modified: httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_balancer.c?rev=383291&r1=383290&r2=383291&view=diff
==============================================================================
--- httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_balancer.c Sat Mar  4 23:08:28 2006
 <at>  <at>  -71,6 +71,9  <at>  <at> 

     r->filename = apr_pstrcat(r->pool, "proxy:balancer://", host,
(Continue reading)

Permalink | Reply | 0 comments |
headers
rooneg | 5 Mar 2006 08:30
Picon
Favicon

svn commit: r383292 - /httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c

Author: rooneg
Date: Sat Mar  4 23:30:50 2006
New Revision: 383292

URL: http://svn.apache.org/viewcvs?rev=383292&view=rev
Log:
Don't just hardcode 30 seconds as the poll timeout.

* modules/proxy/mod_proxy_fcgi.c
  (dispatch): Use the worker timeout for our polls, falling back to the
   old behavior of 30 seconds if there is no worker timeout set.

Modified:
    httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c

Modified: httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c?rev=383292&r1=383291&r2=383292&view=diff
==============================================================================
--- httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c (original)
+++ httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c Sat Mar  4 23:30:50 2006
 <at>  <at>  -519,11 +519,17  <at>  <at> 
     ob = apr_brigade_create(r->pool, c->bucket_alloc);

     while (! done) {
+        apr_interval_time_t timeout = conn->worker->timeout;
         apr_size_t len;
         int n;

-        /* XXX don't hardcode 30 seconds */
-        rv = apr_poll(&pfd, 1, &n, apr_time_from_sec(30));
(Continue reading)

Permalink | Reply | 0 comments |
headers
rpluem | 5 Mar 2006 14:39
Picon
Favicon

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

Author: rpluem
Date: Sun Mar  5 05:39:47 2006
New Revision: 383319

URL: http://svn.apache.org/viewcvs?rev=383319&view=rev
Log:
* The "Correctly error out if we get an error from upstream response." has
  been accepted for backport.

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

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=383319&r1=383318&r2=383319&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sun Mar  5 05:39:47 2006
 <at>  <at>  -100,22 +100,6  <at>  <at> 
       +1: rpluem, niq, jerenkrantz
       NOTE: this also supersedes previous fix to PR#37790

-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-
-    * mod_dbd: When threaded, create a private pool in child_init
-      so we're not using the process pool later.  Also improve
-      configuration defaults and merge function.
-      (this assumes Colm's windows-build fixes are also backported)
-      http://svn.apache.org/viewcvs.cgi?rev=348026&view=rev
-      http://svn.apache.org/viewcvs.cgi?rev=354400&view=rev
-      +1 niq
(Continue reading)

Permalink | Reply | 0 comments |

Gmane