gmane.comp.apache.cvs

svn commit: r1494196 - /httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c

2013-06-18T16:51:18

Author: fuankg
Date: Tue Jun 18 16:51:17 2013
New Revision: 1494196

URL: http://svn.apache.org/r1494196
Log:
Fix for stupid CodeWarrior compiler.

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c?rev=1494196&r1=1494195&r2=1494196&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c Tue Jun 18 16:51:17 2013
< at >< at > -118,15 +118,16 < at >< at > static int proxy_wstunnel_pump(ws_baton_
 static void proxy_wstunnel_callback(void *b) { 
     int status;
     ws_baton_t *baton = (ws_baton_t*)b;
+    apr_socket_t *sockets[3] = {NULL, NULL, NULL};
     apr_thread_mutex_lock(baton->r->invoke_mtx);
     apr_pool_clear(baton->subpool);
     status = proxy_wstunnel_pump(baton, apr_time_from_sec(5));
+    socket

svn commit: r1494619 - /httpd/httpd/branches/2.4.x/STATUS

2013-06-19T13:41:34

Author: minfrin
Date: Wed Jun 19 13:41:34 2013
New Revision: 1494619

URL: http://svn.apache.org/r1494619
Log:
Add a comment.

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

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1494619&r1=1494618&r2=1494619&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jun 19 13:41:34 2013
< at >< at > -212,6 +212,9 < at >< at > PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                 AIUI, especially cache_total starts to go wrong if the cache
                 gets larger than 4GB (UINT_MAX). Maybe set the limit at
                 MIN(APR_SIZE_MAX,UINT_MAX) until this is fixed?
+      minfrin: Surely we should just fix these unsigned ints? Not sure what value
+               there would be in trying to bake in an arbitrary limit in the mean
+               time when we can just fix the underlying

svn commit: r1494597 - in /httpd/httpd/branches/2.4.x: ./ STATUS modules/cache/mod_cache_socache.c

2013-06-19T12:55:57

Author: rjung
Date: Wed Jun 19 12:55:56 2013
New Revision: 1494597

URL: http://svn.apache.org/r1494597
Log:
mod_cache_socache: Fix warning "variable 'rv' may
be used uninitialized in this function"
(which is correct here).

Backport of r1494536 form trunk.

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/cache/mod_cache_socache.c

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

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1494597&r1=1494596&r2=1494597&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jun 19 12:55:56 2013
< at >< at > -90,12 +90,6 < at >< at > RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start al

svn commit: r1494570 - /httpd/httpd/branches/2.4.x/STATUS

2013-06-19T11:53:24

Author: fuankg
Date: Wed Jun 19 11:53:23 2013
New Revision: 1494570

URL: http://svn.apache.org/r1494570
Log:
Vote, promote.

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

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1494570&r1=1494569&r2=1494570&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jun 19 11:53:23 2013
< at >< at > -90,6 +90,12 < at >< at > RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+    * mod_cache_socache: Fix warning "variable 'rv' may be used uninitialized
+      in this function" (which is correct here).
+      trunk patch: http://svn.apache.org/r1494536
+      2.4.x patch: trunk patch works
+      +1: rjung, minfrin, fuankg
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the lis

svn commit: r1494569 - /httpd/httpd/branches/2.4.x/STATUS

2013-06-19T11:52:25

Author: fuankg
Date: Wed Jun 19 11:52:25 2013
New Revision: 1494569

URL: http://svn.apache.org/r1494569
Log:
Applied.

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

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1494569&r1=1494568&r2=1494569&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jun 19 11:52:25 2013
< at >< at > -90,13 +90,6 < at >< at > RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * passwd_common.[c|h]: sync with trunk to silent compiler warnings.
-      trunk patch: http://svn.apache.org/r1481677
-                   http://svn.apache.org/r1494317
-                   http://svn.apache.org/r1488496
-      2.4.x patch: http://people.apache.org/~fuankg/diffs/2.4.x-passwd_common.diff
-      +1: fuankg, gsmith, minfrin
- 
 
 PATCHES P

svn commit: r1494568 - in /httpd/httpd/branches/2.4.x/support: passwd_common.c passwd_common.h

2013-06-19T11:51:58

Author: fuankg
Date: Wed Jun 19 11:51:57 2013
New Revision: 1494568

URL: http://svn.apache.org/r1494568
Log:
sync with trunk to silent compiler warnings.
Backport of r1481677, r1494317, r1488496.
Reviewed by: fuankg, gsmith, minfrin

Modified:
    httpd/httpd/branches/2.4.x/support/passwd_common.c
    httpd/httpd/branches/2.4.x/support/passwd_common.h

Modified: httpd/httpd/branches/2.4.x/support/passwd_common.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/support/passwd_common.c?rev=1494568&r1=1494567&r2=1494568&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/support/passwd_common.c (original)
+++ httpd/httpd/branches/2.4.x/support/passwd_common.c Wed Jun 19 11:51:57 2013
< at >< at > -24,8 +24,10 < at >< at >
 
 #include "apr_md5.h"
 #include "apr_sha1.h"
-#include <time.h>
 
+#if APR_HAVE_TIME_H
+#include <time.h>
+#endif
 #if APR_HAVE_CRYPT_H
 #include <crypt.h>
 #endif
< at >< at > -38,10 +40,12 < at >< at >
 #if APR_HAVE_UNISTD_H
 #include <unistd.h>
 #e

svn commit: r1494565 - /httpd/httpd/branches/2.4.x/STATUS

2013-06-19T11:42:07

Author: minfrin
Date: Wed Jun 19 11:42:06 2013
New Revision: 1494565

URL: http://svn.apache.org/r1494565
Log:
Promote.

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

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1494565&r1=1494564&r2=1494565&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jun 19 11:42:06 2013
< at >< at > -89,6 +89,13 < at >< at > RELEASE SHOWSTOPPERS:
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
+
+    * passwd_common.[c|h]: sync with trunk to silent compiler warnings.
+      trunk patch: http://svn.apache.org/r1481677
+                   http://svn.apache.org/r1494317
+                   http://svn.apache.org/r1488496
+      2.4.x patch: http://people.apache.org/~fuankg/diffs/2.4.x-passwd_common.diff
+      +1: fuankg, gsmith, minfrin
  
 
 PATCHE

svn commit: r1494563 - /httpd/httpd/branches/2.4.x/STATUS

2013-06-19T11:39:49

Author: minfrin
Date: Wed Jun 19 11:39:49 2013
New Revision: 1494563

URL: http://svn.apache.org/r1494563
Log:
Vote.

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

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1494563&r1=1494562&r2=1494563&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jun 19 11:39:49 2013
< at >< at > -218,7 +218,7 < at >< at > PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                    http://svn.apache.org/r1494317
                    http://svn.apache.org/r1488496
       2.4.x patch: http://people.apache.org/~fuankg/diffs/2.4.x-passwd_common.diff
-      +1: fuankg, gsmith
+      +1: fuankg, gsmith, minfrin
 
     * mod_cache_socache: Fix warning "variable 'rv' may be used uninitialized
       in this function" (which is correct here).

svn commit: r1494554 - /httpd/httpd/branches/2.4.x/STATUS

2013-06-19T11:31:09

Author: minfrin
Date: Wed Jun 19 11:31:09 2013
New Revision: 1494554

URL: http://svn.apache.org/r1494554
Log:
Vote.

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

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1494554&r1=1494553&r2=1494554&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jun 19 11:31:09 2013
< at >< at > -224,7 +224,7 < at >< at > PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       in this function" (which is correct here).
       trunk patch: http://svn.apache.org/r1494536
       2.4.x patch: trunk patch works
-      +1: rjung
+      +1: rjung, minfrin
 
 
 A list of further possible backports can be found at:

svn commit: r1494549 - in /httpd/httpd/trunk: docs/log-message-tags/next-number modules/http/http_filters.c

2013-06-19T11:19:51

Author: minfrin
Date: Wed Jun 19 11:19:50 2013
New Revision: 1494549

URL: http://svn.apache.org/r1494549
Log:
Update the log message number.

Modified:
    httpd/httpd/trunk/docs/log-message-tags/next-number
    httpd/httpd/trunk/modules/http/http_filters.c

Modified: httpd/httpd/trunk/docs/log-message-tags/next-number
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/next-number?rev=1494549&r1=1494548&r2=1494549&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/log-message-tags/next-number (original)
+++ httpd/httpd/trunk/docs/log-message-tags/next-number Wed Jun 19 11:19:50 2013
< at >< at > -1 +1 < at >< at >
-2484
+2485

Modified: httpd/httpd/trunk/modules/http/http_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?rev=1494549&r1=1494548&r2=1494549&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_filters.c (original)

svn commit: r1494538 - /httpd/httpd/branches/2.4.x/STATUS

2013-06-19T10:29:37

Author: rjung
Date: Wed Jun 19 10:29:37 2013
New Revision: 1494538

URL: http://svn.apache.org/r1494538
Log:
Propose.

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

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1494538&r1=1494537&r2=1494538&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jun 19 10:29:37 2013
< at >< at > -95,7 +95,6 < at >< at > PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
 
-
   * mod_auth_basic: Add a generic mechanism to fake basic authentication
     using the ap_expr parser. This allows the administrator to construct
     their own username and password for basic authentication based on their
< at >< at > -221,6 +220,12 < at >< at > PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: http://people.apache.org/~fuankg/diffs/2.4.x-passwd_common.diff
       +1: f

svn commit: r1494536 - /httpd/httpd/trunk/modules/cache/mod_cache_socache.c

2013-06-19T10:21:46

Author: rjung
Date: Wed Jun 19 10:21:46 2013
New Revision: 1494536

URL: http://svn.apache.org/r1494536
Log:
Fix "variable 'rv' may be used uninitialized
in this function" warning.

Modified:
    httpd/httpd/trunk/modules/cache/mod_cache_socache.c

Modified: httpd/httpd/trunk/modules/cache/mod_cache_socache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache_socache.c?rev=1494536&r1=1494535&r2=1494536&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache_socache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache_socache.c Wed Jun 19 10:21:46 2013
< at >< at > -1421,7 +1421,7 < at >< at > static int socache_post_config(apr_pool_
                 &conf->provider->socache_instance, conf->provider->args, ptmp,
                 pconf);
         if (errmsg) {
-            ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, plog,
+            ap_log_perror(APLOG_MARK, APLOG_CRIT, 0, plog,
                     APLOGNO(02392) "%s", e

svn commit: r1494532 - /httpd/httpd/trunk/modules/aaa/mod_auth_digest.c

2013-06-19T10:16:35

Author: rjung
Date: Wed Jun 19 10:16:35 2013
New Revision: 1494532

URL: http://svn.apache.org/r1494532
Log:
Fix "unused variable" warning.

Modified:
    httpd/httpd/trunk/modules/aaa/mod_auth_digest.c

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_auth_digest.c?rev=1494532&r1=1494531&r2=1494532&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_digest.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_digest.c Wed Jun 19 10:16:35 2013
< at >< at > -445,9 +445,9 < at >< at > static void *create_digest_dir_config(ap
 static const char *set_realm(cmd_parms *cmd, void *config, const char *realm)
 {
     digest_config_rec *conf = (digest_config_rec *) config;
+#ifdef AP_DEBUG
     int i;
 
-#ifdef AP_DEBUG
     /* check that we got random numbers */
     for (i = 0; i < SECRET_LEN; i++) {
         if (secret[i] != 0)

svn commit: r1494531 - /httpd/httpd/trunk/server/mpm/eventopt/eventopt.c

2013-06-19T10:16:04

Author: rjung
Date: Wed Jun 19 10:16:03 2013
New Revision: 1494531

URL: http://svn.apache.org/r1494531
Log:
Fix "unused variable" warning.

Modified:
    httpd/httpd/trunk/server/mpm/eventopt/eventopt.c

Modified: httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/eventopt/eventopt.c?rev=1494531&r1=1494530&r2=1494531&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/eventopt/eventopt.c (original)
+++ httpd/httpd/trunk/server/mpm/eventopt/eventopt.c Wed Jun 19 10:16:03 2013
< at >< at > -833,7 +833,6 < at >< at > static int process_pollop(pollset_op_t *
  */
 static int start_lingering_close(event_conn_state_t *cs, ap_equeue_t *eq)
 {
-    apr_status_t rv;
     int ret = 1;
 
     apr_socket_t *csd = ap_get_conn_socket(cs->c);
< at >< at > -849,7 +848,7 < at >< at > static int start_lingering_close(event_c
 
 #ifdef AP_DEBUG
     {
-        rv = apr_socket_timeout_set(csd, 0);
+        apr_status_t rv = apr_socket_ti

svn commit: r1494524 - /httpd/test/framework/trunk/t/modules/info.t

2013-06-19T09:38:00

Author: rjung
Date: Wed Jun 19 09:38:00 2013
New Revision: 1494524

URL: http://svn.apache.org/r1494524
Log:
Fix mod_info test in combination with eventopt mpm.

Modified:
    httpd/test/framework/trunk/t/modules/info.t

Modified: httpd/test/framework/trunk/t/modules/info.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/info.t?rev=1494524&r1=1494523&r2=1494524&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/info.t (original)
+++ httpd/test/framework/trunk/t/modules/info.t Wed Jun 19 09:38:00 2013
< at >< at > -31,7 +31,7 < at >< at > foreach (split /\n/, $info) {
 
 foreach (sort keys %$mods) {
     ($mods->{$_} && !$config->should_skip_module($_)) or next;
-    if ($_ =~ /^mod_mpm_(event|prefork|worker)\.c$/) {
+    if ($_ =~ /^mod_mpm_(eventopt|event|prefork|worker)\.c$/) {
         push(< at >expected,"$1.c");
     } elsif ($_ eq 'mod_mpm_simple.c') {
         push(< at >expected,'simple_api.c');

svn commit: r1494469 - /httpd/httpd/branches/2.4.x/STATUS

2013-06-19T06:31:52

Author: gsmith
Date: Wed Jun 19 06:31:51 2013
New Revision: 1494469

URL: http://svn.apache.org/r1494469
Log:
vote

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

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1494469&r1=1494468&r2=1494469&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jun 19 06:31:51 2013
< at >< at > -219,7 +219,7 < at >< at > PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                    http://svn.apache.org/r1494317
                    http://svn.apache.org/r1488496
       2.4.x patch: http://people.apache.org/~fuankg/diffs/2.4.x-passwd_common.diff
-      +1: fuankg
+      +1: fuankg, gsmith
 
 
 A list of further possible backports can be found at:

svn commit: r1494407 - /httpd/httpd/trunk/server/skiplist.c

2013-06-19T01:00:46

Author: jim
Date: Wed Jun 19 01:00:46 2013
New Revision: 1494407

URL: http://svn.apache.org/r1494407
Log:
use a simple allocation list to enable re-use of
"freed" chunks. If not using pools, we assume malloc/free
is sane.

Modified:
    httpd/httpd/trunk/server/skiplist.c

Modified: httpd/httpd/trunk/server/skiplist.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/skiplist.c?rev=1494407&r1=1494406&r2=1494407&view=diff
==============================================================================
--- httpd/httpd/trunk/server/skiplist.c (original)
+++ httpd/httpd/trunk/server/skiplist.c Wed Jun 19 01:00:46 2013
< at >< at > -37,6 +37,7 < at >< at > struct ap_skiplist {
     ap_skiplistnode *topend;
     ap_skiplistnode *bottomend;
     ap_skiplist *index;
+    apr_array_header_t *memlist;
     apr_pool_t *pool;
 };
 
< at >< at > -51,7 +52,6 < at >< at > struct ap_skiplistnode {
     ap_skiplist *sl;
 };
 
-
 #ifndef MIN
 #define MIN(a,b) ((a<b)?(a):(b))
 #endif
< at >< at > -68,10 +68,56 < at >< at > static int get_b_rand(void)
     return ((randseq & (1

svn commit: r1494402 - /httpd/httpd/branches/2.4.x/STATUS

2013-06-19T00:34:36

Author: fuankg
Date: Wed Jun 19 00:34:36 2013
New Revision: 1494402

URL: http://svn.apache.org/r1494402
Log:
propose.

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

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1494402&r1=1494401&r2=1494402&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jun 19 00:34:36 2013
< at >< at > -214,6 +214,13 < at >< at > PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                 gets larger than 4GB (UINT_MAX). Maybe set the limit at
                 MIN(APR_SIZE_MAX,UINT_MAX) until this is fixed?
 
+    * passwd_common.[c|h]: sync with trunk to silent compiler warnings.
+      trunk patch: http://svn.apache.org/r1481677
+                   http://svn.apache.org/r1494317
+                   http://svn.apache.org/r1488496
+      2.4.x patch: http://people.apache.org/~fuankg/diffs/2.4.x-passwd_common.

svn commit: r1494317 - /httpd/httpd/trunk/support/passwd_common.c

2013-06-18T21:30:53

Author: fuankg
Date: Tue Jun 18 21:30:53 2013
New Revision: 1494317

URL: http://svn.apache.org/r1494317
Log:
Make MSVC compilers happy.

Modified:
    httpd/httpd/trunk/support/passwd_common.c

Modified: httpd/httpd/trunk/support/passwd_common.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/passwd_common.c?rev=1494317&r1=1494316&r2=1494317&view=diff
==============================================================================
--- httpd/httpd/trunk/support/passwd_common.c (original)
+++ httpd/httpd/trunk/support/passwd_common.c Tue Jun 18 21:30:53 2013
< at >< at > -44,6 +44,10 < at >< at >
 #include <io.h>
 #endif
 
+#ifdef _MSC_VER
+#define write _write
+#endif
+
 apr_file_t *errfile;
 
 int abort_on_oom(int rc)

svn commit: r1494277 - /httpd/httpd/branches/2.4.x/STATUS

2013-06-18T20:03:41

Author: sf
Date: Tue Jun 18 20:03:41 2013
New Revision: 1494277

URL: http://svn.apache.org/r1494277
Log:
comment

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

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1494277&r1=1494276&r2=1494277&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Jun 18 20:03:41 2013
< at >< at > -207,6 +207,12 < at >< at > PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                    http://svn.apache.org/r1493925
       2.4.x patch: trunk patch works modulo CHANGES
       +1: minfrin, jim
+      sf notes: I think a number of variables need to be changed from int to
+                apr_size_t, including subcache_size, subcache_data_offset,
+                subcache_data_size, total, cache_total. 
+                AIUI, especially cache_total starts to go wrong if the cache
+                gets larger tha

svn commit: r1494196 - /httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c

2013-06-18T16:51:18

Author: fuankg
Date: Tue Jun 18 16:51:17 2013
New Revision: 1494196

URL: http://svn.apache.org/r1494196
Log:
Fix for stupid CodeWarrior compiler.

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c?rev=1494196&r1=1494195&r2=1494196&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c Tue Jun 18 16:51:17 2013
< at >< at > -118,15 +118,16 < at >< at > static int proxy_wstunnel_pump(ws_baton_
 static void proxy_wstunnel_callback(void *b) { 
     int status;
     ws_baton_t *baton = (ws_baton_t*)b;
+    apr_socket_t *sockets[3] = {NULL, NULL, NULL};
     apr_thread_mutex_lock(baton->r->invoke_mtx);
     apr_pool_clear(baton->subpool);
     status = proxy_wstunnel_pump(baton, apr_time_from_sec(5));
+    socket