Commit 8bb8f1d1 authored by Paul Querna's avatar Paul Querna
Browse files

* 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@708599 13f79535-47bb-0310-9956-ffa450edef68
parent 785ed4d8

server/mpm/simple/simple_children.c

+1 −0
Changes for server/mpm/simple/simple_children.c: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -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))

server/mpm/simple/simple_io.c

+3 −3
Changes for server/mpm/simple/simple_io.c: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -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 @@ simple_io_process(simple_conn_t *scon) 
        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 @@ simple_io_process(simple_conn_t *scon) 
      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;