/* TODO: this file should be deleted after the other todos are dealt with */
-/* TODO: extern MODULE_VAR_EXPORT int ap_suexec_enabled; */
-#define ap_suexec_enabled (0)
-/* TODO: extern API_VAR_EXPORT int ap_extended_status; */
-
/* TODO: extern enum server_token_type ap_server_tokens; */
-/* We want this to have the least chance of being corrupted if there
- * is some memory corruption, so we allocate it statically.
- */
-/* TODO: extern char ap_coredump_dir[MAX_STRING_LEN]; */
-
/* TODO: extern int ap_configtestonly; ... although it pains me because this breaks an abstraction */
/* TODO: extern int ap_docrootcheck; */
extern "C" {
#endif
+#ifdef CORE_PRIVATE
conn_rec *ap_new_connection(ap_context_t *p, server_rec *server, BUFF *inout,
const struct sockaddr_in *remaddr,
const struct sockaddr_in *saddr, long id);
const ap_socket_t *conn_socket, long id);
CORE_EXPORT(void) ap_process_connection(conn_rec *);
int ap_process_http_connection(conn_rec *);
+#endif
/* Hooks */
DECLARE_HOOK(void,pre_connection,(conn_rec *))
API_EXPORT(int) ap_satisfies (request_rec *r);
API_EXPORT(const ap_array_header_t *) ap_requires (request_rec *);
-#ifdef WIN32
-/*
- * CGI Script stuff for Win32...
- */
-typedef enum { eFileTypeUNKNOWN, eFileTypeBIN, eFileTypeEXE16, eFileTypeEXE32,
- eFileTypeSCRIPT } file_type_e;
-typedef enum { INTERPRETER_SOURCE_UNSET, INTERPRETER_SOURCE_REGISTRY,
- INTERPRETER_SOURCE_SHEBANG } interpreter_source_e;
-API_EXPORT(file_type_e) ap_get_win32_interpreter(const request_rec *, char **);
-#endif
-
#ifdef CORE_PRIVATE
/*
ap_array_header_t *sec;
regex_t *r;
-#ifdef WIN32
- /* Where to find interpreter to run scripts */
- interpreter_source_e script_interpreter_source;
-#endif
-
} core_dir_config;
/* Per-server core configuration */
#endif
#define APLOG_NOERRNO (APLOG_LEVELMASK + 1)
-#ifdef WIN32
-/* Set to indicate that error msg should come from Win32's GetLastError(),
- * not errno. */
-#define APLOG_WIN32ERROR ((APLOG_LEVELMASK+1) * 2)
-#endif
/* normal but significant condition on startup, usually printed to stderr */
#define APLOG_STARTUP ((APLOG_LEVELMASK + 1) * 4)
typedef struct piped_log {
ap_context_t *p;
+ ap_file_t *fds[2];
+ /* XXX - an #ifdef that needs to be eliminated from public view. Shouldn't
+ * be hard */
#ifdef HAVE_RELIABLE_PIPED_LOGS
char *program;
ap_proc_t *pid;
- ap_file_t *fds[2];
-#else
- ap_file_t *write_f;
#endif
} piped_log;
API_EXPORT(piped_log *) ap_open_piped_log (ap_context_t *p, const char *program);
API_EXPORT(void) ap_close_piped_log (piped_log *);
-#ifdef HAVE_RELIABLE_PIPED_LOGS
#define ap_piped_log_read_fd(pl) ((pl)->fds[0])
#define ap_piped_log_write_fd(pl) ((pl)->fds[1])
-#else
-#define ap_piped_log_read_fd(pl) (-1)
-#define ap_piped_log_write_fd(pl) ((pl)->write_f)
-#endif
#ifdef __cplusplus
}
* httpd.h: header for simple (ha! not anymore) http daemon
*/
+/* XXX - We need to push more stuff to other .h files, or even .c files, to
+ * make this file smaller
+ */
+
+
/* Headers in which EVERYONE has an interest... */
-#include "ap_config.h"
#include "apr_general.h"
#include "apr_lib.h"
#include "apr_time.h"
+#include "apr_network_io.h"
#include "buff.h"
#include "ap.h"
+#include "ap_mmn.h"
+
+#include <netinet/in.h>
+
+#ifdef CORE_PRIVATE
/* ----------------------------- config dir ------------------------------ */
#endif
#endif /* HTTPD_ROOT */
+/*
+ * --------- You shouldn't have to edit anything below this line ----------
+ *
+ * Any modifications to any defaults not defined above should be done in the
+ * respective config. file.
+ *
+ */
+
/* Default location of documents. Can be overridden by the DocumentRoot
* directive.
*/
#define TARGET "httpd"
#endif
-/*
- * --------- You shouldn't have to edit anything below this line ----------
- *
- * Any modifications to any defaults not defined above should be done in the
- * respective config. file.
- *
- */
-
-
-/* -- Internal representation for a HTTP protocol number, e.g., HTTP/1.1 -- */
-
-#define HTTP_VERSION(major,minor) (1000*(major)+(minor))
-#define HTTP_VERSION_MAJOR(number) ((number)/1000)
-#define HTTP_VERSION_MINOR(number) ((number)%1000)
-
-
-/* -------------- Port number for server running standalone --------------- */
-
-#define DEFAULT_HTTP_PORT 80
-#define DEFAULT_HTTPS_PORT 443
-#define ap_is_default_port(port,r) ((port) == ap_default_port(r))
-#define ap_http_method(r) ap_run_http_method(r)
-#define ap_default_port(r) ap_run_default_port(r)
-
-/* --------- Default user name and group name running standalone ---------- */
+/* --------- Default user name and group name ----------------------------- */
/* --- These may be specified as numbers by placing a # before a number --- */
#ifndef DEFAULT_USER
#endif
#endif /* DEFAULT_ERRORLOG */
-#ifndef DEFAULT_PIDLOG
-#define DEFAULT_PIDLOG "logs/httpd.pid"
-#endif
-#ifndef DEFAULT_SCOREBOARD
-#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
-#endif
-#ifndef DEFAULT_LOCKFILE
-#define DEFAULT_LOCKFILE "logs/accept.lock"
-#endif
-
-/* Define this to be what your HTML directory content files are called */
-#ifndef DEFAULT_INDEX
-#define DEFAULT_INDEX "index.html"
-#endif
-
-/* Define this to 1 if you want fancy indexing, 0 otherwise */
-#ifndef DEFAULT_INDEXING
-#define DEFAULT_INDEXING 0
-#endif
-
-/* Define this to be what type you'd like returned for files with unknown */
-/* suffixes. MUST be all lower case. */
-#ifndef DEFAULT_CONTENT_TYPE
-#define DEFAULT_CONTENT_TYPE "text/plain"
-#endif
-
/* Define this to be what your per-directory security files are called */
#ifndef DEFAULT_ACCESS_FNAME
#ifdef OS2
#define RESOURCE_CONFIG_FILE "conf/srm.conf"
#endif
-/* The name of the MIME types file */
-#ifndef TYPES_CONFIG_FILE
-#define TYPES_CONFIG_FILE "conf/mime.types"
-#endif
-
/* The name of the access file */
#ifndef ACCESS_CONFIG_FILE
#define ACCESS_CONFIG_FILE "conf/access.conf"
#ifndef DEFAULT_RFC1413
#define DEFAULT_RFC1413 0
#endif
-/* The default directory in user's home dir */
-#ifndef DEFAULT_USER_DIR
-#define DEFAULT_USER_DIR "public_html"
-#endif
/* The default path for CGI scripts if none is currently set */
#ifndef DEFAULT_PATH
#define DEFAULT_PATH "/bin:/usr/bin:/usr/ucb:/usr/bsd:/usr/local/bin"
#endif
-/* The path to the shell interpreter, for parsed docs */
-#ifndef SHELL_PATH
-#if defined(OS2) || defined(WIN32)
-/* Set default for OS/2 and Windows file system */
-#define SHELL_PATH "CMD.EXE"
-#else
-#define SHELL_PATH "/bin/sh"
-#endif
-#endif /* SHELL_PATH */
-
/* The path to the suExec wrapper, can be overridden in Configuration */
#ifndef SUEXEC_BIN
#define SUEXEC_BIN HTTPD_ROOT "/sbin/suexec"
#endif
-/* The default string lengths */
-#define MAX_STRING_LEN HUGE_STRING_LEN
-#define HUGE_STRING_LEN 8192
-
/* The timeout for waiting for messages */
#ifndef DEFAULT_TIMEOUT
#define DEFAULT_TIMEOUT 120000
#define DEFAULT_KEEPALIVE 100
#endif
-/* The size of the server's internal read-write buffers */
-#define IOBUFSIZE 8192
-
-/*
- * Special Apache error codes. These are basically used
- * in http_main.c so we can keep track of various errors.
- *
- * APEXIT_OK:
- * A normal exit
- * APEXIT_INIT:
- * A fatal error arising during the server's init sequence
- * APEXIT_CHILDINIT:
- * The child died during it's init sequence
- * APEXIT_CHILDFATAL:
- * A fatal error, resulting in the whole server aborting.
- * If a child exits with this error, the parent process
- * considers this a server-wide fatal error and aborts.
- *
- */
-#define APEXIT_OK 0x0
-#define APEXIT_INIT 0x2
-#define APEXIT_CHILDINIT 0x3
-#define APEXIT_CHILDFATAL 0xf
-
-/*
- * (Unix, OS/2 only)
- * Interval, in microseconds, between scoreboard maintenance. During
- * each scoreboard maintenance cycle the parent decides if it needs to
- * spawn a new child (to meet MinSpareServers requirements), or kill off
- * a child (to meet MaxSpareServers requirements). It will only spawn or
- * kill one child per cycle. Setting this too low will chew cpu. The
- * default is probably sufficient for everyone. But some people may want
- * to raise this on servers which aren't dedicated to httpd and where they
- * don't like the httpd waking up each second to see what's going on.
- */
-#ifndef SCOREBOARD_MAINTENANCE_INTERVAL
-#define SCOREBOARD_MAINTENANCE_INTERVAL 1000000
-#endif
-
-/* Number of requests to try to handle in a single process. If <= 0,
- * the children don't die off. That's the default here, since I'm still
- * interested in finding and stanching leaks.
- */
-
-#ifndef DEFAULT_MAX_REQUESTS_PER_CHILD
-#define DEFAULT_MAX_REQUESTS_PER_CHILD 10000
-#endif
-
-#ifndef DEFAULT_EXCESS_REQUESTS_PER_CHILD
-#define DEFAULT_EXCESS_REQUESTS_PER_CHILD 0
-#endif
-
/* The maximum length of the queue of pending connections, as defined
* by listen(2). Under some systems, it should be increased if you
* are experiencing a heavy TCP SYN flood attack.
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/2.0-dev" /* SEE COMMENTS ABOVE */
-#define SERVER_VERSION SERVER_BASEVERSION
+/* Define this to 1 if you want fancy indexing, 0 otherwise */
+#ifndef DEFAULT_INDEXING
+#define DEFAULT_INDEXING 0
+#endif
+#endif /* CORE_PRIVATE */
+
+#define AP_SERVER_BASEVERSION "Apache/2.0-dev" /* SEE COMMENTS ABOVE */
+#define AP_SERVER_VERSION AP_SERVER_BASEVERSION
+
+#define AP_SERVER_PROTOCOL "HTTP/1.1"
+
+
+/* ------------------ stuff that modules are allowed to look at ----------- */
+
+/* Define this to be what your HTML directory content files are called */
+#ifndef AP_DEFAULT_INDEX
+#define AP_DEFAULT_INDEX "index.html"
+#endif
+
+
+/* Define this to be what type you'd like returned for files with unknown */
+/* suffixes. MUST be all lower case. */
+#ifndef DEFAULT_CONTENT_TYPE
+#define DEFAULT_CONTENT_TYPE "text/plain"
+#endif
+
+/* The name of the MIME types file */
+#ifndef AP_TYPES_CONFIG_FILE
+#define AP_TYPES_CONFIG_FILE "conf/mime.types"
+#endif
+
+/*
+ * Define the HTML doctype strings centrally.
+ */
+#define DOCTYPE_HTML_2_0 "<!DOCTYPE HTML PUBLIC \"-//IETF//" \
+ "DTD HTML 2.0//EN\">\n"
+#define DOCTYPE_HTML_3_2 "<!DOCTYPE HTML PUBLIC \"-//W3C//" \
+ "DTD HTML 3.2 Final//EN\">\n"
+#define DOCTYPE_HTML_4_0S "<!DOCTYPE HTML PUBLIC \"-//W3C//" \
+ "DTD HTML 4.0//EN\"\n" \
+ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+#define DOCTYPE_HTML_4_0T "<!DOCTYPE HTML PUBLIC \"-//W3C//" \
+ "DTD HTML 4.0 Transitional//EN\"\n" \
+ "\"http://www.w3.org/TR/REC-html40/loose.dtd\">\n"
+#define DOCTYPE_HTML_4_0F "<!DOCTYPE HTML PUBLIC \"-//W3C//" \
+ "DTD HTML 4.0 Frameset//EN\"\n" \
+ "\"http://www.w3.org/TR/REC-html40/frameset.dtd\">\n"
+
+/* -- Internal representation for a HTTP protocol number, e.g., HTTP/1.1 -- */
+
+#define HTTP_VERSION(major,minor) (1000*(major)+(minor))
+#define HTTP_VERSION_MAJOR(number) ((number)/1000)
+#define HTTP_VERSION_MINOR(number) ((number)%1000)
+
+/* -------------- Port number for server running standalone --------------- */
+
+#define DEFAULT_HTTP_PORT 80
+#define DEFAULT_HTTPS_PORT 443
+#define ap_is_default_port(port,r) ((port) == ap_default_port(r))
+#define ap_http_method(r) ap_run_http_method(r)
+#define ap_default_port(r) ap_run_default_port(r)
+
+/* The default string lengths */
+#define MAX_STRING_LEN HUGE_STRING_LEN
+#define HUGE_STRING_LEN 8192
+
+/* The size of the server's internal read-write buffers */
+#define IOBUFSIZE 8192
+
+/*
+ * Special Apache error codes. These are basically used
+ * in http_main.c so we can keep track of various errors.
+ *
+ * APEXIT_OK:
+ * A normal exit
+ * APEXIT_INIT:
+ * A fatal error arising during the server's init sequence
+ * APEXIT_CHILDINIT:
+ * The child died during it's init sequence
+ * APEXIT_CHILDFATAL:
+ * A fatal error, resulting in the whole server aborting.
+ * If a child exits with this error, the parent process
+ * considers this a server-wide fatal error and aborts.
+ *
+ */
+#define APEXIT_OK 0x0
+#define APEXIT_INIT 0x2
+#define APEXIT_CHILDINIT 0x3
+#define APEXIT_CHILDFATAL 0xf
/* TODO: re-implement the server token/version stuff -- it's part of http_core
* it should be possible to do without touching http_main at all. (or else
*/
#define APACHE_RELEASE 10309100
-#define SERVER_PROTOCOL "HTTP/1.1"
-#ifndef SERVER_SUPPORT
-#define SERVER_SUPPORT "http://www.apache.org/"
-#endif
-
#define DECLINED -1 /* Module declines to handle */
#define DONE -2 /* Module has served the response completely
* - it's safe to die() with no more output
#define CGI_MAGIC_TYPE "application/x-httpd-cgi"
#define INCLUDES_MAGIC_TYPE "text/x-server-parsed-html"
#define INCLUDES_MAGIC_TYPE3 "text/x-server-parsed-html3"
-#ifdef CHARSET_EBCDIC
-#define ASCIITEXT_MAGIC_TYPE_PREFIX "text/x-ascii-" /* Text files whose content-type starts with this are passed thru unconverted */
-#endif /*CHARSET_EBCDIC*/
-#define MAP_FILE_MAGIC_TYPE "application/x-type-map"
-#define ASIS_MAGIC_TYPE "httpd/send-as-is"
#define DIR_MAGIC_TYPE "httpd/unix-directory"
-#define STATUS_MAGIC_TYPE "application/x-httpd-status"
-
-/*
- * Define the HTML doctype strings centrally.
- */
-#define DOCTYPE_HTML_2_0 "<!DOCTYPE HTML PUBLIC \"-//IETF//" \
- "DTD HTML 2.0//EN\">\n"
-#define DOCTYPE_HTML_3_2 "<!DOCTYPE HTML PUBLIC \"-//W3C//" \
- "DTD HTML 3.2 Final//EN\">\n"
-#define DOCTYPE_HTML_4_0S "<!DOCTYPE HTML PUBLIC \"-//W3C//" \
- "DTD HTML 4.0//EN\"\n" \
- "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#define DOCTYPE_HTML_4_0T "<!DOCTYPE HTML PUBLIC \"-//W3C//" \
- "DTD HTML 4.0 Transitional//EN\"\n" \
- "\"http://www.w3.org/TR/REC-html40/loose.dtd\">\n"
-#define DOCTYPE_HTML_4_0F "<!DOCTYPE HTML PUBLIC \"-//W3C//" \
- "DTD HTML 4.0 Frameset//EN\"\n" \
- "\"http://www.w3.org/TR/REC-html40/frameset.dtd\">\n"
-/* Just in case your linefeed isn't the one the other end is expecting. */
-#ifndef CHARSET_EBCDIC
#define LF 10
#define CR 13
-#else /* CHARSET_EBCDIC */
-#include "ebcdic.h"
-/* OSD_POSIX uses the EBCDIC charset. The transition ASCII->EBCDIC is done in
- * the buff package (bread/bputs/bwrite), so everywhere else, we use
- * "native EBCDIC" CR and NL characters. These are therefore defined as
- * '\r' and '\n'.
- * NB: this is not the whole truth - sometimes \015 and \012 are contained
- * in literal (EBCDIC!) strings, so these are not converted but passed.
- */
-#define CR '\r'
-#define LF '\n'
-#endif /* CHARSET_EBCDIC */
/* Possible values for request_rec.read_body (set by handling module):
* REQUEST_NO_BODY Send 413 error if message has any body
typedef struct server_addr_rec server_addr_rec;
struct server_addr_rec {
server_addr_rec *next;
- struct in_addr host_addr; /* The bound address, for this server */
+ ap_in_addr host_addr; /* The bound address, for this server */
unsigned short host_port; /* The bound port, for this server */
char *virthost; /* The name given in <VirtualHost> */
};
int limit_req_fields; /* limit on number of request header fields */
};
+/* stuff marked API_EXPORT is part of the API, and intended for use
+ * by modules
+ */
+#ifndef API_EXPORT
+#define API_EXPORT(type) type
+#endif
+
+/* Stuff marked API_EXPORT_NONSTD is part of the API, and intended for
+ * use by modules. The difference between API_EXPORT and
+ * API_EXPORT_NONSTD is that the latter is required for any functions
+ * which use varargs or are used via indirect function call. This
+ * is to accomodate the two calling conventions in windows dlls.
+ */
+#ifndef API_EXPORT_NONSTD
+#define API_EXPORT_NONSTD(type) type
+#endif
+
+#ifndef MODULE_VAR_EXPORT
+#define MODULE_VAR_EXPORT
+#endif
+#ifndef API_VAR_EXPORT
+#define API_VAR_EXPORT
+#endif
+
+/* modules should not used functions marked CORE_EXPORT
+ * or CORE_EXPORT_NONSTD */
+#ifndef CORE_EXPORT
+#define CORE_EXPORT API_EXPORT
+#endif
+#ifndef CORE_EXPORT_NONSTD
+#define CORE_EXPORT_NONSTD API_EXPORT_NONSTD
+#endif
-/* Prototypes for utilities... util.c.
+/* On Mac OS X Server, symbols that conflict with loaded dylibs
+ * (eg. System framework) need to be declared as private symbols with
+ * __private_extern__.
+ * For other systems, make that a no-op.
*/
+#ifndef ap_private_extern
+#if (defined(MAC_OS) || defined(MAC_OS_X_SERVER)) && defined(__DYNAMIC__)
+#define ap_private_extern __private_extern__
+#else
+#define ap_private_extern
+#endif
+#endif
/* Time */
API_EXPORT(char *) ap_uudecode(ap_context_t *p, const char *bufcoded);
API_EXPORT(char *) ap_uuencode(ap_context_t *p, char *string);
-#ifdef OS2
-void os2pathname(char *path);
-char *ap_double_quotes(ap_context_t *p, char *str);
+/* Regexes */
+#ifdef AP_USE_HSREGEX
+#include "hsregex.h"
+#else
+#include <regex.h>
#endif
API_EXPORT(regex_t *) ap_pregcomp(ap_context_t *p, const char *pattern,
/* Detach from open configfile_t, calling the close handler */
API_EXPORT(int) ap_cfg_closefile(configfile_t *cfp);
-#ifdef NEED_STRERROR
-char *strerror(int err);
-#endif
-
/* Misc system hackery */
API_EXPORT(uid_t) ap_uname2id(const char *name);
API_EXPORT(int) ap_get_max_daemons(void);
API_EXPORT(const server_rec *) ap_get_server_conf(void);
-#ifndef HAVE_CANONICAL_FILENAME
-/*
- * We can't define these in os.h because of dependence on ap_context_t pointer.
- */
-#define ap_os_canonical_filename(p,f) (f)
-#define ap_os_case_canonical_filename(p,f) (f)
-#define ap_os_systemcase_filename(p,f) (f)
-#else
-API_EXPORT(char *) ap_os_canonical_filename(ap_context_t *p, const char *file);
-#ifdef WIN32
-API_EXPORT(char *) ap_os_case_canonical_filename(ap_context_t *pPool, const char *szFile);
-API_EXPORT(char *) ap_os_systemcase_filename(ap_context_t *pPool, const char *szFile);
-#else
-#define ap_os_case_canonical_filename(p,f) ap_os_canonical_filename(p,f)
-#define ap_os_systemcase_filename(p,f) ap_os_canonical_filename(p,f)
-#endif
-#endif
-
#ifdef _OSD_POSIX
extern const char *os_set_account(ap_context_t *p, const char *account);
extern int os_init_job_environment(server_rec *s, const char *user_name, int one_process);
char *ap_get_local_host(ap_context_t *);
unsigned long ap_get_virthost_addr(char *hostname, unsigned short *port);
-extern API_VAR_EXPORT time_t ap_restart_time;
-
-/*
- * Apache tries to keep all of its long term filehandles (such as log files,
- * and sockets) above this number. This is to workaround problems in many
- * third party libraries that are compiled with a small FD_SETSIZE. There
- * should be no reason to lower this, because it's only advisory. If a file
- * can't be allocated above this number then it will remain in the "slack"
- * area.
- *
- * Only the low slack line is used by default. If HIGH_SLACK_LINE is defined
- * then an attempt is also made to keep all non-FILE * files above the high
- * slack line. This is to work around a Solaris C library limitation, where it
- * uses an unsigned char to store the file descriptor.
- */
-#ifndef LOW_SLACK_LINE
-#define LOW_SLACK_LINE 15
-#endif
-/* #define HIGH_SLACK_LINE 255 */
-
-#if 0
-/* Moved to APR now.*/
-/*
- * The ap_slack() function takes a fd, and tries to move it above the indicated
- * line. It returns an fd which may or may not have moved above the line, and
- * never fails. If the high line was requested and it fails it will also try
- * the low line.
- */
-#ifdef NO_SLACK
-#define ap_slack(fd,line) (fd)
-#else
-APRFile ap_slack(APRFile fd, int line);
-#define AP_SLACK_LOW 1
-#define AP_SLACK_HIGH 2
-#endif
-#endif
-
API_EXPORT(char *) ap_escape_quotes(ap_context_t *p, const char *instr);
/*
__attribute__((noreturn));
#define ap_assert(exp) ((exp) ? (void)0 : ap_log_assert(#exp,__FILE__,__LINE__))
-/* The optimized timeout code only works if we're not MULTITHREAD and we're
- * also not using a scoreboard file
- */
-#if !defined (MULTITHREAD) && \
- (defined (USE_MMAP_SCOREBOARD) || defined (USE_SHMGET_SCOREBOARD))
-#define OPTIMIZE_TIMEOUTS
-#endif
-
/* A set of flags which indicate places where the server should raise(SIGSTOP).
* This is useful for debugging, because you can then attach to that process
* with gdb and continue. This is important in cases where one_process
* util_date.h: prototypes for date parsing utility routines
*/
-#ifdef NEWSOS
-#include <stdlib.h>
-#include <sys/types.h>
-#endif
-#include <time.h>
#include "apr_time.h"
+/* XXX - This section lists include files for OS-specific types that APR
+ * should replace. Once they are replaced, this section should be
+ * removed */
+#ifndef NO_MORE_OS_TYPES_IN_THIS_FILE
+#include "ap_config_auto.h"
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#endif /* NO_MORE_OS_TYPES_IN_THIS_FILE */
#define BAD_DATE (time_t)0
API_EXPORT(char *) ap_md5(ap_context_t *a, const unsigned char *string);
API_EXPORT(char *) ap_md5_binary(ap_context_t *a, const unsigned char *buf, int len);
API_EXPORT(char *) ap_md5contextTo64(ap_context_t *p, AP_MD5_CTX * context);
-#ifdef CHARSET_EBCDIC
-API_EXPORT(char *) ap_md5digest(ap_context_t *p, ap_file_t *infile, int convert);
-#else
API_EXPORT(char *) ap_md5digest(ap_context_t *p, ap_file_t *infile);
-#endif /* CHARSET_EBCDIC */
#ifdef __cplusplus
}
#include "util_md5.h"
#include "apr_fnmatch.h"
#include "http_connection.h"
+#include "ap_config.h"
/* Allow Apache to use ap_mmap */
#ifdef USE_MMAP_FILES
#include "util_date.h" /* For parseHTTPdate and BAD_DATE */
#include "mpm_status.h"
#include <stdarg.h>
+#include "ap_config.h"
HOOK_STRUCT(
HOOK_LINK(post_read_request)
#include "http_protocol.h"
#include "http_log.h"
#include "http_main.h"
-#if 0
-#include "scoreboard.h"
-#endif
#include "apr_fnmatch.h"
+#include "ap_config.h"
HOOK_STRUCT(
HOOK_LINK(translate_name)
/* common stuff that beos MPMs will want */
+/* Default user name and group name. These may be specified as numbers by
+ * placing a # before a number */
+
+#ifndef DEFAULT_USER
+#define DEFAULT_USER "#-1"
+#endif
+#ifndef DEFAULT_GROUP
+#define DEFAULT_GROUP "#-1"
+#endif
+
typedef struct {
char *user_name;
uid_t user_id;
*/
extern int ap_os_is_path_absolute(const char *file);
+#define ap_os_canonical_filename(p,f) (f)
+#define ap_os_case_canonical_filename(p,f) (f)
+#define ap_os_systemcase_filename(p,f) (f)
#define ap_os_is_filename_valid(f) (1)
#define ap_os_kill(pid, sig) kill(pid, sig)
extern int ap_os_is_path_absolute(const char *file);
#endif
+API_EXPORT(char *) ap_os_canonical_filename(ap_context_t *p, const char *file);
+#define ap_os_case_canonical_filename(p,f) ap_os_canonical_filename(p,f)
+#define ap_os_systemcase_filename(p,f) ap_os_canonical_filename(p,f)
/* FIXME: the following should be implemented on this platform */
#define ap_os_is_filename_valid(f) (1)
/* Other ap_os_ routines not used by this platform */
+#define ap_os_canonical_filename(p,f) (f)
+#define ap_os_case_canonical_filename(p,f) (f)
+#define ap_os_systemcase_filename(p,f) (f)
#define ap_os_is_filename_valid(f) (1)
#define ap_os_kill(pid, sig) kill(pid, sig)
#include "http_main.h"
#include "http_log.h"
#include "unixd.h"
+#include <pwd.h>
unixd_config_rec unixd_config;
/* common stuff that unix MPMs will want */
+/* Default user name and group name. These may be specified as numbers by
+ * placing a # before a number */
+
+#ifndef DEFAULT_USER
+#define DEFAULT_USER "#-1"
+#endif
+#ifndef DEFAULT_GROUP
+#define DEFAULT_GROUP "#-1"
+#endif
+
typedef struct {
char *user_name;
uid_t user_id;
#define spawnle os_spawnle
/* OS-dependent filename routines in util_win32.c */
+API_EXPORT(char *) ap_os_canonical_filename(ap_context_t *p, const char *file);
+API_EXPORT(char *) ap_os_case_canonical_filename(ap_context_t *pPool, const char *szFile);
+API_EXPORT(char *) ap_os_systemcase_filename(ap_context_t *pPool, const char *szFile);
int ap_os_is_filename_valid(const char *file);
int os_strftime(char *, size_t , const char *, const struct tm *);
#include "http_request.h" /* for default_handler (see invoke_handler) */
#include "http_main.h"
#include "http_vhost.h"
-#include "explain.h"
+#include "ap_config.h"
HOOK_STRUCT(
HOOK_LINK(header_parser)
(pconf,plog,ptemp,s))
IMPLEMENT_HOOK_VOID(child_init,(ap_context_t *pchild, server_rec *s),(pchild,s))
-DEF_Explain
-
/****************************************************************
*
* We begin with the functions which deal with the linked list
#include "mpm_status.h"
#include "http_config.h"
#include "http_vhost.h"
+#include "ap_config.h"
HOOK_STRUCT(
HOOK_LINK(pre_connection)
*/
#include "apr_network_io.h"
+
+#define CORE_PRIVATE
#include "httpd.h"
#include "http_config.h"
#include "ap_listen.h"
#include "http_log.h"
+#include <string.h>
ap_listen_rec *ap_listeners;
static ap_listen_rec *old_listeners;
#define CORE_PRIVATE
+#include "ap_config.h"
#include "apr_lib.h"
#include "apr_portable.h"
#include "httpd.h"
len += ap_snprintf(errstr + len, MAX_STRING_LEN - len,
"[client %s] ", r->connection->remote_ip);
}
+ /* XXX - need an APRized strerror() */
if (!(level & APLOG_NOERRNO)
- && (status != 0)
-#ifdef WIN32
- && !(level & APLOG_WIN32ERROR)
-#endif
- ) {
+ && (status != 0)) {
len += ap_snprintf(errstr + len, MAX_STRING_LEN - len,
"(%d)%s: ", status, strerror(status));
}
-#ifdef WIN32
- if (level & APLOG_WIN32ERROR) {
- int nChars;
- int nErrorCode;
-
- nErrorCode = GetLastError();
- len += ap_snprintf(errstr + len, MAX_STRING_LEN - len,
- "(%d)", nErrorCode);
-
- nChars = FormatMessage(
- FORMAT_MESSAGE_FROM_SYSTEM,
- NULL,
- nErrorCode,
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* // Default language */
- (LPTSTR) errstr + len,
- MAX_STRING_LEN - len,
- NULL
- );
- len += nChars;
- if (nChars == 0) {
- /* Um, error occurred, but we can't recurse to log it again
- * (and it would probably only fail anyway), so lets just
- * log the numeric value.
- */
- nErrorCode = GetLastError();
- len += ap_snprintf(errstr + len, MAX_STRING_LEN - len,
- "(FormatMessage failed with code %d): ",
- nErrorCode);
- }
- else {
- /* FormatMessage put the message in the buffer, but it may
- * have appended a newline (\r\n). So remove it and use
- * ": " instead like the Unix errors. The error may also
- * end with a . before the return - if so, trash it.
- */
- if (len > 1 && errstr[len-2] == '\r' && errstr[len-1] == '\n') {
- if (len > 2 && errstr[len-3] == '.')
- len--;
- errstr[len-2] = ':';
- errstr[len-1] = ' ';
- }
- }
- }
-#endif
len += ap_vsnprintf(errstr + len, MAX_STRING_LEN - len, fmt, args);
#endif
if ((ap_createprocattr_init(&procattr, pl->p) != APR_SUCCESS) ||
(ap_setprocattr_dir(procattr, pl->program) != APR_SUCCESS) ||
- (ap_set_childin(procattr, pl->fds[0], pl->fds[1]) != APR_SUCCESS)) {
+ (ap_set_childin(procattr, ap_piped_log_read_fd(pl), ap_piped_log_write_fd(pl)) != APR_SUCCESS)) {
/* Something bad happened, give up and go away. */
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
- "piped_log_spawn: unable to exec %s -c '%s': %s",
- SHELL_PATH, pl->program, strerror (errno));
+ "piped_log_spawn: unable to exec '%s': %s",
+ pl->program, strerror (errno));
rc = -1;
}
else {
/* successful that the child is running. */
pl->pid = procnew;
ap_get_os_proc(&pid, procnew);
- ap_register_other_child(pid, piped_log_maintenance, pl, pl->fds[1]);
+ ap_register_other_child(pid, piped_log_maintenance, pl, ap_piped_log_write_fd(pl));
}
}
ap_kill(pl->pid, SIGTERM);
}
ap_unregister_other_child(pl);
- ap_close(pl->fds[0]);
- ap_close(pl->fds[1]);
+ ap_close(ap_piped_log_read_fd(pl));
+ ap_close(ap_piped_log_write_fd(pl));
return APR_SUCCESS;
}
{
piped_log *pl = data;
- ap_close(pl->fds[0]);
- ap_close(pl->fds[1]);
+ ap_close(ap_piped_log_read_fd(pl));
+ ap_close(ap_piped_log_write_fd(pl));
return APR_SUCCESS;
}
-
API_EXPORT(piped_log *) ap_open_piped_log(ap_context_t *p, const char *program)
{
piped_log *pl;
pl->p = p;
pl->program = ap_pstrdup(p, program);
pl->pid = NULL;
- if (ap_create_pipe(&pl->fds[0], &pl->fds[1], p) != APR_SUCCESS) {
+ if (ap_create_pipe(&ap_piped_log_read_fd(pl), &ap_piped_log_write_fd(pl), p) != APR_SUCCESS) {
int save_errno = errno;
errno = save_errno;
return NULL;
if (piped_log_spawn(pl) == -1) {
int save_errno = errno;
ap_kill_cleanup(p, pl, piped_log_cleanup);
- ap_close(pl->fds[0]);
- ap_close(pl->fds[1]);
+ ap_close(ap_piped_log_read_fd(pl));
+ ap_close(ap_piped_log_write_fd(pl));
errno = save_errno;
return NULL;
}
return pl;
}
-API_EXPORT(void) ap_close_piped_log(piped_log *pl)
+#else
+
+static ap_status_t piped_log_cleanup(void *data)
{
- piped_log_cleanup(pl);
- ap_kill_cleanup(pl->p, pl, piped_log_cleanup);
+ piped_log *pl = data;
+
+ ap_close(ap_piped_log_write_fd(pl));
+ return APR_SUCCESS;
}
-#else
API_EXPORT(piped_log *) ap_open_piped_log(ap_context_t *p, const char *program)
{
piped_log *pl;
pl = ap_palloc(p, sizeof (*pl));
pl->p = p;
- pl->write_f = dummy;
+ ap_piped_log_read_fd(pl) = NULL;
+ ap_piped_log_write_fd(pl) = dummy;
+ ap_register_cleanup(p, pl, piped_log_cleanup, piped_log_cleanup);
return pl;
}
+#endif
API_EXPORT(void) ap_close_piped_log(piped_log *pl)
{
- ap_close(pl->write_f);
+ ap_run_cleanup(pl->p, pl, piped_log_cleanup);
}
-#endif
+
#include "util_uri.h"
#include "apr_getopt.h"
#include "ap_mpm.h"
+#include "ap_config.h"
const char *ap_server_argv0;
ap_array_header_t *ap_server_post_read_config;
ap_array_header_t *ap_server_config_defines;
+/* XXX - We should be able to grab the per-MPM settings here too */
static void show_compile_settings(void)
{
printf("Server version: %s\n", ap_get_server_version());
#define CORE_PRIVATE
+#include "ap_config.h"
#include "apr_portable.h"
#include "httpd.h"
#include "http_main.h"
#define HARD_SERVER_LIMIT 8
#endif
+/* File used for accept locking, when we use a file */
+#ifndef DEFAULT_LOCKFILE
+#define DEFAULT_LOCKFILE "logs/accept.lock"
+#endif
+
+/* Where the main/parent process's pid is logged */
+#ifndef DEFAULT_PIDLOG
+#define DEFAULT_PIDLOG "logs/httpd.pid"
+#endif
+
+/*
+ * Interval, in microseconds, between scoreboard maintenance.
+ */
+#ifndef SCOREBOARD_MAINTENANCE_INTERVAL
+#define SCOREBOARD_MAINTENANCE_INTERVAL 1000000
+#endif
+
+/* Number of requests to try to handle in a single process. If <= 0,
+ * the children don't die off.
+ */
+#ifndef DEFAULT_MAX_REQUESTS_PER_CHILD
+#define DEFAULT_MAX_REQUESTS_PER_CHILD 10000
+#endif
+
#endif /* AP_MPM_DEFAULT_H */
*
*/
+#include "ap_config.h"
#include "httpd.h"
#include "http_log.h"
#include "http_main.h"
#include "mpm_status.h"
#include "scoreboard.h"
#include "dexter.h" /* for max_daemons_limit */
-#ifdef USE_SHMGET_SCOREBOARD
#include <sys/types.h>
+#ifdef USE_SHMGET_SCOREBOARD
#include <sys/ipc.h>
#include <sys/shm.h>
#endif
#define DEFAULT_THREADS_PER_CHILD 10
#endif
+/* Where the main/parent process's pid is logged */
+#ifndef DEFAULT_PIDLOG
+#define DEFAULT_PIDLOG "logs/httpd.pid"
+#endif
+
+/*
+ * Interval, in microseconds, between scoreboard maintenance.
+ */
+#ifndef SCOREBOARD_MAINTENANCE_INTERVAL
+#define SCOREBOARD_MAINTENANCE_INTERVAL 1000000
+#endif
+
+/* Number of requests to try to handle in a single process. If <= 0,
+ * the children don't die off.
+ */
+#ifndef DEFAULT_MAX_REQUESTS_PER_CHILD
+#define DEFAULT_MAX_REQUESTS_PER_CHILD 10000
+#endif
+
#endif /* AP_MPM_DEFAULT_H */
#define DEFAULT_THREADS_PER_CHILD 50
#endif
+/* File used for accept locking, when we use a file */
+#ifndef DEFAULT_LOCKFILE
+#define DEFAULT_LOCKFILE "logs/accept.lock"
+#endif
+
+/* Scoreboard file, if there is one */
+#ifndef DEFAULT_SCOREBOARD
+#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
+#endif
+
+/* Where the main/parent process's pid is logged */
+#ifndef DEFAULT_PIDLOG
+#define DEFAULT_PIDLOG "logs/httpd.pid"
+#endif
+
+/*
+ * Interval, in microseconds, between scoreboard maintenance.
+ */
+#ifndef SCOREBOARD_MAINTENANCE_INTERVAL
+#define SCOREBOARD_MAINTENANCE_INTERVAL 1000000
+#endif
+
+/* Number of requests to try to handle in a single process. If <= 0,
+ * the children don't die off.
+ */
+#ifndef DEFAULT_MAX_REQUESTS_PER_CHILD
+#define DEFAULT_MAX_REQUESTS_PER_CHILD 10000
+#endif
+
#endif /* AP_MPM_DEFAULT_H */
#define CORE_PRIVATE
#include "apr_portable.h"
+#include "apr_thread_proc.h"
+#include "ap_config.h"
#include "httpd.h"
#include "http_main.h"
#include "http_log.h"
#include "scoreboard.h"
#include <netinet/tcp.h>
+#include <sys/wait.h>
#include <pthread.h>
#include <signal.h>
+#include "ap_config.h"
#include "httpd.h"
#include "http_log.h"
#include "http_main.h"
#include "mpm_status.h"
#include "mpmt_pthread.h"
#include "scoreboard.h"
-#ifdef USE_SHMGET_SCOREBOARD
#include <sys/types.h>
+#ifdef USE_SHMGET_SCOREBOARD
#include <sys/ipc.h>
#include <sys/shm.h>
#endif
#else
#define SCOREBOARD_FILE
static scoreboard _scoreboard_image;
-static int scoreboard_fd = -1;
-static ap_file_t *scoreboard_file = NULL;
static ap_file_t *scoreboard_file = NULL;
/* XXX: things are seriously screwed if we ever have to do a partial
API_EXPORT(void) reopen_scoreboard(ap_context_t *p)
{
if (scoreboard_fd != -1)
- ap_close(scoreboard_fd);
+ ap_close(scoreboard_file);
ap_open(p, ap_scoreboard_fname, APR_CREATE | APR_BINARY | APR_READ | APR_WRITE,
APR_UREAD | APR_UWRITE | APR_GREAD | APR_GWRITE | APR_WREAD | APR_WWRITE,
#endif
#ifdef HAVE_SYS_TIMES_H
+#include <sys/time.h>
#include <sys/times.h>
#elif defined(TPF)
#include <time.h>
#include "mpm_default.h" /* For HARD_.*_LIMIT */
+/* The optimized timeout code only works if we're not using a scoreboard file
+ */
+#if (defined (USE_MMAP_SCOREBOARD) || defined (USE_SHMGET_SCOREBOARD))
+#define OPTIMIZE_TIMEOUTS
+#endif
+
/* Scoreboard info on a process is, for now, kept very brief ---
* just status value and pid (the latter so that the caretaker process
* can properly update the scoreboard when a process dies). We may want
#define HARD_SERVER_LIMIT 256
#endif
+/* File used for accept locking, when we use a file */
+#ifndef DEFAULT_LOCKFILE
+#define DEFAULT_LOCKFILE "logs/accept.lock"
+#endif
+
+/* Scoreboard file, if there is one */
+#ifndef DEFAULT_SCOREBOARD
+#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
+#endif
+
+/* Where the main/parent process's pid is logged */
+#ifndef DEFAULT_PIDLOG
+#define DEFAULT_PIDLOG "logs/httpd.pid"
+#endif
+
+/*
+ * Interval, in microseconds, between scoreboard maintenance.
+ */
+#ifndef SCOREBOARD_MAINTENANCE_INTERVAL
+#define SCOREBOARD_MAINTENANCE_INTERVAL 1000000
+#endif
+
+/* Number of requests to try to handle in a single process. If <= 0,
+ * the children don't die off.
+ */
+#ifndef DEFAULT_MAX_REQUESTS_PER_CHILD
+#define DEFAULT_MAX_REQUESTS_PER_CHILD 10000
+#endif
+
#endif /* AP_MPM_DEFAULT_H */
#define CORE_PRIVATE
+#include "ap_config.h"
#include "apr_portable.h"
#include "httpd.h"
#include "mpm_default.h"
#include "unixd.h"
#include "iol_socket.h"
#include "ap_listen.h"
-#ifdef USE_SHMGET_SCOREBOARD
+#include "ap_mmn.h"
+#include <sys/times.h>
#include <sys/types.h>
+#include <sys/wait.h>
+#ifdef USE_SHMGET_SCOREBOARD
#include <sys/ipc.h>
#include <sys/shm.h>
#endif
#include <time.h>
#else
#include <sys/times.h>
+#include <sys/time.h>
#endif /* TPF */
#endif
-#ifdef HAVE_SYS_TIMES_H
-#include <sys/times.h>
+
+/* The optimized timeout code only works if we're not using a scoreboard file
+ */
+#if (defined (USE_MMAP_SCOREBOARD) || defined (USE_SHMGET_SCOREBOARD))
+#define OPTIMIZE_TIMEOUTS
#endif
/* Scoreboard info on a process is, for now, kept very brief ---
#define HARD_SERVER_LIMIT 256
#endif
+/* Where the main/parent process's pid is logged */
+#ifndef DEFAULT_PIDLOG
+#define DEFAULT_PIDLOG "logs/httpd.pid"
+#endif
+
+/*
+ * Interval, in microseconds, between scoreboard maintenance.
+ */
+#ifndef SCOREBOARD_MAINTENANCE_INTERVAL
+#define SCOREBOARD_MAINTENANCE_INTERVAL 1000000
+#endif
+
+/* Number of requests to try to handle in a single process. If <= 0,
+ * the children don't die off.
+ */
+#ifndef DEFAULT_MAX_REQUESTS_PER_CHILD
+#define DEFAULT_MAX_REQUESTS_PER_CHILD 10000
+#endif
+
#endif /* AP_MPM_DEFAULT_H */
#include <sys/times.h>
#endif
+/* The optimized timeout code only works if we're not using a scoreboard file
+ */
+#if (defined (USE_MMAP_SCOREBOARD) || defined (USE_SHMGET_SCOREBOARD))
+#define OPTIMIZE_TIMEOUTS
+#endif
+
/* Scoreboard info on a thread is, for now, kept very brief ---
* just status value and pid (the latter so that the caretaker thread
* can properly update the scoreboard when a thread dies). We may want
#define HARD_SERVER_LIMIT 8
#endif
+/* Where the main/parent process's pid is logged */
+#ifndef DEFAULT_PIDLOG
+#define DEFAULT_PIDLOG "logs/httpd.pid"
+#endif
+
+/*
+ * Interval, in microseconds, between scoreboard maintenance.
+ */
+#ifndef SCOREBOARD_MAINTENANCE_INTERVAL
+#define SCOREBOARD_MAINTENANCE_INTERVAL 1000000
+#endif
+
+/* Number of requests to try to handle in a single process. If <= 0,
+ * the children don't die off.
+ */
+#ifndef DEFAULT_MAX_REQUESTS_PER_CHILD
+#define DEFAULT_MAX_REQUESTS_PER_CHILD 10000
+#endif
+
#endif /* AP_MPM_DEFAULT_H */
#include "rfc1413.h"
#include "http_main.h" /* set_callback_and_alarm */
#include "apr_network_io.h"
+#include <string.h>
/* Local stuff. */
/* Semi-well-known port */
* #define DEBUG_CFG_LINES to trace every line read from the config files
*/
+#define CORE_PRIVATE
+
#include "httpd.h"
#include "http_main.h"
#include "http_log.h"
#include "http_protocol.h"
+#include "ap_config.h"
#if defined(SUNOS4)
/* stdio.h has been read in ap_config.h already. Add missing prototypes here: */
extern int fgetc(FILE *);
return ap_pbase64encode(p, string);
}
-#ifdef OS2
-void os2pathname(char *path)
-{
- char newpath[MAX_STRING_LEN];
- int loop;
- int offset;
-
- offset = 0;
- for (loop = 0; loop < (strlen(path) + 1) && loop < sizeof(newpath) - 1; loop++) {
- if (path[loop] == '/') {
- newpath[offset] = '\\';
- /*
- offset = offset + 1;
- newpath[offset] = '\\';
- */
- }
- else
- newpath[offset] = path[loop];
- offset = offset + 1;
- };
- /* Debugging code */
- /* fprintf(stderr, "%s \n", newpath); */
-
- strcpy(path, newpath);
-};
-
-/* quotes in the string are doubled up.
- * Used to escape quotes in args passed to OS/2's cmd.exe
- */
-char *ap_double_quotes(ap_context_t *p, char *str)
-{
- int num_quotes = 0;
- int len = 0;
- char *quote_doubled_str, *dest;
-
- while (str[len]) {
- num_quotes += str[len++] == '\"';
- }
-
- quote_doubled_str = ap_palloc(p, len + num_quotes + 1);
- dest = quote_doubled_str;
-
- while (*str) {
- if (*str == '\"')
- *(dest++) = '\"';
- *(dest++) = *(str++);
- }
-
- *dest = 0;
- return quote_doubled_str;
-}
-#endif
-
-
#ifndef HAVE_STRERROR
char *
strerror(int err)
*
*/
+#define CORE_PRIVATE
+
#include "ap_config.h"
#include "util_date.h"
#include <ctype.h>
#include "http_request.h" /* for sub_req_lookup_uri() */
#include "util_script.h"
#include "util_date.h" /* For parseHTTPdate() */
+#include <stdlib.h>
+#include <string.h>
#ifdef OS2
#define INCL_DOS
#include "httpd.h"
#include "http_log.h"
#include "util_uri.h"
+#include <string.h>
+#include <netdb.h>
/* Some WWW schemes and their default ports; this is basically /etc/services */
/* This will become global when the protocol abstraction comes */
#include "http_vhost.h"
#include "http_protocol.h"
#include "http_core.h"
+#include "ap_config.h"
/*
* After all the definitions there's an explanation of how it's all put
projects / apache / commitdiff