You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by pq...@apache.org on 2008/10/28 17:06:25 UTC
svn commit: r708599 - in /httpd/httpd/trunk/server/mpm/simple:
simple_children.c simple_io.c
Author: pquerna
Date: Tue Oct 28 09:06:25 2008
New Revision: 708599
URL: http://svn.apache.org/viewvc?rev=708599&view=rev
Log:
* simple_io.c line 111 and 145 cause a build falure with --enable-maintainer-mode .
* simple_children.c should include simple_children.h.
* simple_io_timeot_cb should be static.
Noticed by: Takashi Sato
Modified:
httpd/httpd/trunk/server/mpm/simple/simple_children.c
httpd/httpd/trunk/server/mpm/simple/simple_io.c
Modified: httpd/httpd/trunk/server/mpm/simple/simple_children.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/simple/simple_children.c?rev=708599&r1=708598&r2=708599&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/simple/simple_children.c (original)
+++ httpd/httpd/trunk/server/mpm/simple/simple_children.c Tue Oct 28 09:06:25 2008
@@ -19,6 +19,7 @@
#include "simple_types.h"
#include "simple_event.h"
#include "simple_run.h"
+#include "simple_children.h"
#include "apr_hash.h"
#define SPAWN_CHILDREN_INTERVAL (apr_time_from_sec(5))
Modified: httpd/httpd/trunk/server/mpm/simple/simple_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/simple/simple_io.c?rev=708599&r1=708598&r2=708599&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/simple/simple_io.c (original)
+++ httpd/httpd/trunk/server/mpm/simple/simple_io.c Tue Oct 28 09:06:25 2008
@@ -28,7 +28,7 @@
#include "scoreboard.h"
#include "http_vhost.h"
-void
+static void
simple_io_timeot_cb(simple_core_t *sc,
void *baton)
{
@@ -108,7 +108,7 @@
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf,
"apr_pollcb_add: failed in write completion");
- AP_DEBUG_ASSERT(rc == APR_SUCCESS);
+ AP_DEBUG_ASSERT(rv == APR_SUCCESS);
}
return APR_SUCCESS;
}
@@ -142,7 +142,7 @@
if (rv) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf,
"process_socket: apr_pollset_add failure in read request line");
- AP_DEBUG_ASSERT(rc == APR_SUCCESS);
+ AP_DEBUG_ASSERT(rv == APR_SUCCESS);
}
return APR_SUCCESS;