clean up a bunch of -Wall/etc warnings (aa8ae1e0) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

modules/http/http_protocol.c

+1 −1

Changes for modules/http/http_protocol.c: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -2015,10 +2015,10 @@ API_EXPORT(int) ap_discard_request_body(request_rec *r)
		*/
		API_EXPORT(long) ap_send_fd(ap_file_t fd, request_rec r)
		{
		ap_status_t rv;
		long len = r->finfo.size;
		#ifdef HAVE_SENDFILE
		if (!r->chunked) {
		ap_status_t rv;
		ap_bsetopt(r->connection->client, BO_TIMEOUT,
		r->connection->keptalive
		? &r->server->keep_alive_timeout

+1 −0

Changes for server/log.c: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@
		#include "ap_config.h"
		#include "apr_lib.h"
		#include "apr_portable.h"
		#include "apr_config.h" /* XXX for ap_signal?? */
		#include "httpd.h"
		#include "http_config.h"
		#include "http_core.h"

+4 −2

Changes for server/mpm/prefork/prefork.c: 4 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@

		#include "ap_config.h"
		#include "apr_portable.h"
		#include "apr_config.h" /* XXX: for ap_signal?? */
		#include "httpd.h"
		#include "mpm_default.h"
		#include "mpm_status.h"
		@@ -909,9 +910,10 @@ static ap_shmem_t *scoreboard_shm = NULL;

		static ap_status_t cleanup_shared_mem(void *d)
		{
		mm_free(scoreboard_shm, ap_scoreboard_image);
		ap_shm_free(scoreboard_shm, ap_scoreboard_image);
		ap_scoreboard_image = NULL;
		ap_shm_destroy(scoreboard_shm);
		return APR_SUCCESS;
		}

		static void setup_shared_mem(ap_context_t *p)
		@@ -1379,7 +1381,7 @@ static void restart(int sig)
		return;
		}
		restart_pending = 1;
		if (is_graceful = sig == SIGUSR1) {
		if ((is_graceful = (sig == SIGUSR1))) {
		ap_kill_cleanup(pconf, NULL, cleanup_shared_mem);
		}
		}

+1 −0