Commit 49291cd5 authored by Greg Stein's avatar Greg Stein
Browse files

*) Compensate for recent changes in the APR headers. Specifically, some 

   files need to specifically include stdio.h, or a particular apr_*.h
   header.

*) Adjust callers of apr_create_process() to deal with the extra "const"

*) Add "const" to args of ap_os_create_privileged_process()


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

include/ap_mpm.h

+8 −7
Original line number Diff line number Diff line
@@ -154,11 +154,12 @@ AP_DECLARE(void) ap_start_shutdown(void); 
 *         process

 * @param p The pool to use. 

 */

AP_DECLARE(apr_status_t) ap_os_create_privileged_process(const request_rec *r,

AP_DECLARE(apr_status_t) ap_os_create_privileged_process(

    const request_rec *r,

    apr_proc_t *newproc, 

    const char *progname,

                                                         char *const *args, 

                                                         char **env,

    const char * const *args, 

    const char * const *env,

    apr_procattr_t *attr, 

    apr_pool_t *p);

include/http_core.h

+8 −2
Original line number Diff line number Diff line
@@ -59,12 +59,18 @@ 
#ifndef APACHE_HTTP_CORE_H

#define APACHE_HTTP_CORE_H



#include "apr.h"



#if APR_HAVE_STRUCT_RLIMIT

#include <sys/time.h>

#include <sys/resource.h>

#endif





#ifdef __cplusplus

extern "C" {

#endif



#include "apr_lib.h"



/**

 * @package CORE HTTP Daemon

 */

include/httpd.h

+5 −3
Original line number Diff line number Diff line
@@ -77,12 +77,14 @@ extern "C" { 


/* Headers in which EVERYONE has an interest... */

#include "ap_config.h"

#include "ap_mmn.h"



#include "os.h"

#include "apr_general.h"

#include "apr_lib.h"



#include "apr_tables.h"

#include "apr_pools.h"

#include "apr_time.h"

#include "apr_network_io.h"

#include "ap_mmn.h"



#ifdef HAVE_NETINET_IN_H

#include <netinet/in.h>

modules/dav/fs/lock.c

+6 −4
Original line number Diff line number Diff line
@@ -56,12 +56,14 @@ 
** DAV filesystem lock implementation

*/



#include "httpd.h"

#include "http_log.h"

#include "apr_file_io.h"

#include "apr.h"

#include "apr_strings.h"

#include "apr_file_io.h"

#include "apr_uuid.h"



#include "httpd.h"

#include "http_log.h"



#include "mod_dav.h"

#include "repos.h"
@@ -882,7 +884,7 @@ static dav_error * dav_fs_save_locknull_list(apr_pool_t *p, const char *dirpath, 


    if (pbuf->cur_len == 0) {

	/* delete the file if cur_len == 0 */

	if (remove(pathname) != 0) {

	if (apr_remove_file(pathname, p) != 0) {

	    return dav_new_error(p, HTTP_INTERNAL_SERVER_ERROR, 0,

				 apr_psprintf(p,

					     "Error removing %s", pathname));

modules/dav/fs/repos.c

+6 −1
Original line number Diff line number Diff line
@@ -56,9 +56,14 @@ 
** DAV filesystem-based repository provider

*/



#include "apr.h"

#include "apr_file_io.h"

#include "apr_strings.h"



#if APR_HAVE_STDIO_H

#include <stdio.h>              /* for sprintf() */

#endif



#include "httpd.h"

#include "http_log.h"

#include "http_protocol.h"	/* for ap_set_* (in dav_fs_set_headers) */
@@ -349,7 +354,7 @@ static dav_error * dav_fs_copymove_file( 
	    apr_close(inf);

	    apr_close(outf);



	    if (remove(dst) != 0) {

	    if (apr_remove_file(dst, p) != 0) {

		/* ### ACK! Inconsistent state... */



		/* ### use something besides 500? */