2 ## | ____| / \ | _ \_ _|
3 ## | _| / _ \ | |_) | |
4 ## | |__ / ___ \| __/| |
5 ## |____/_/ \_\_| |___| Extended API for Apache
6 ## ____________________________________________________________________________
8 ## Annotated patch file: eapi.patch
9 ## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved.
10 ## Created on: 16-Oct-2001
12 ## This file assembles changes to existing Apache source files
13 ## between the original Apache and the patched variant. It can be
14 ## automatically applied to a vanilla Apache source tree with the
15 ## 'patch' tool to upgrade those files. Each patch snippet is
16 ## annotated with a short description.
18 ## This file contains all patches to the Apache source
19 ## tree which add the Extended API (EAPI) support.
22 +---------------------------------------------------------------------------
23 | Add the EAPI and EAPI_MM configuration entries which triggers the EAPI
24 | patches and configured the shared memory support via the MM library.
25 +---------------------------------------------------------------------------
26 Index: src/Configuration.tmpl
27 --- src/Configuration.tmpl 2001/10/16 11:47:06 1.1.1.6
28 +++ src/Configuration.tmpl 2001/10/16 11:57:38 1.22
32 ################################################################
33 +# Extended API (EAPI) support:
36 +# The EAPI rule enables more module hooks, a generic low-level hook
37 +# mechanism, a generic context mechanism and shared memory based pools.
40 +# Set the EAPI_MM variable to either the directory of a MM Shared Memory
41 +# Library source tree or the installation tree of MM. Alternatively you can
42 +# also use the value 'SYSTEM' which then indicates that MM is installed
43 +# under various system locations. When the MM library files cannot be found
44 +# the EAPI still can be built, but without shared memory pool support, of
50 +################################################################
51 # Dynamic Shared Object (DSO) support
53 # There is experimental support for compiling the Apache core and
55 +---------------------------------------------------------------------------
56 | Patch in implementation of the EAPI rule.
57 +---------------------------------------------------------------------------
59 --- src/Configure 2001/10/16 11:47:06 1.1.1.16
60 +++ src/Configure 2001/10/16 11:57:38 1.18
61 @@ -1860,6 +1860,72 @@
64 ####################################################################
65 +## Extended API (EAPI) support:
67 +if [ "x$RULE_EAPI" = "x" ]; then
68 + RULE_EAPI=`./helpers/CutRule EAPI $file`
70 +if [ "x$RULE_EAPI" = "xyes" ]; then
71 + echo " + enabling Extended API (EAPI)"
72 + CFLAGS="$CFLAGS -DEAPI"
73 + # some vendor compilers are too restrictive
74 + # for our ap_hook and ap_ctx sources.
76 + *IRIX-32*:*/cc|*IRIX-32*:cc )
77 + CFLAGS="$CFLAGS -woff 1048,1110,1164"
80 + # MM Shared Memory Library support for EAPI
81 + if [ "x$EAPI_MM" = "x" ]; then
82 + EAPI_MM=`egrep '^EAPI_MM=' $file | tail -1 | awk -F= '{print $2}'`
84 + if [ "x$EAPI_MM" != "x" ]; then
87 + * ) for p in . .. ../..; do
88 + if [ -d "$p/$EAPI_MM" ]; then
89 + EAPI_MM="`echo $p/$EAPI_MM | sed -e 's;/\./;/;g'`"
95 + if [ "x$EAPI_MM" = "xSYSTEM" ]; then
96 + echo " using MM library for EAPI: (system-wide)"
97 + CFLAGS="$CFLAGS -DEAPI_MM"
98 + __INCLUDES="`mm-config --cflags`"
99 + if [ "x$__INCLUDES" != "x-I/usr/include" ]; then
100 + INCLUDES="$INCLUDES $__INCLUDES"
102 + LDFLAGS="$LDFLAGS `mm-config --ldflags`"
103 + LIBS="$LIBS `mm-config --libs`"
105 + if [ -f "$EAPI_MM/.libs/libmm.a" -a -f "$EAPI_MM/mm.h" ]; then
106 + echo " using MM library: $EAPI_MM (source-tree only)"
109 + * ) EAPI_MM="\$(SRCDIR)/$EAPI_MM" ;;
111 + CFLAGS="$CFLAGS -DEAPI_MM"
112 + INCLUDES="$INCLUDES -I$EAPI_MM"
113 + LDFLAGS="$LDFLAGS -L$EAPI_MM/.libs"
115 + elif [ -f "$EAPI_MM/bin/mm-config" ]; then
116 + echo " using MM library: $EAPI_MM (installed)"
117 + CFLAGS="$CFLAGS -DEAPI_MM"
118 + INCLUDES="$INCLUDES `$EAPI_MM/bin/mm-config --cflags`"
119 + LDFLAGS="$LDFLAGS `$EAPI_MM/bin/mm-config --ldflags`"
120 + LIBS="$LIBS `$EAPI_MM/bin/mm-config --libs`"
122 + echo "Configure:Error: Cannot find MM library under $EAPI_MM" 1>&2
130 +####################################################################
131 ## Add in the Expat library if needed/wanted.
135 +---------------------------------------------------------------------------
136 | Add the build support for the ap_hook.c and ap_ctx.c sources (Unix)
137 +---------------------------------------------------------------------------
138 Index: src/ap/Makefile.tmpl
139 --- src/ap/Makefile.tmpl 2001/05/20 08:16:15 1.1.1.7
140 +++ src/ap/Makefile.tmpl 2001/05/20 08:23:01 1.7
144 OBJS=ap_cpystrn.o ap_execve.o ap_fnmatch.o ap_getpass.o ap_md5c.o ap_signal.o \
145 - ap_slack.o ap_snprintf.o ap_sha1.o ap_checkpass.o ap_base64.o ap_ebcdic.o
146 + ap_slack.o ap_snprintf.o ap_sha1.o ap_checkpass.o ap_base64.o ap_ebcdic.o \
147 + ap_hook.o ap_ctx.o ap_mm.o
150 $(CC) -c $(INCLUDES) $(CFLAGS) $<
152 +---------------------------------------------------------------------------
153 | Add the build support for the ap_hook.c and ap_ctx.c sources (Win32)
154 +---------------------------------------------------------------------------
156 --- src/ap/ap.mak 2001/10/16 11:47:06 1.1.1.9
157 +++ src/ap/ap.mak 2001/10/16 11:57:38 1.9
159 -@erase "$(INTDIR)\ap_cpystrn.obj"
160 -@erase "$(INTDIR)\ap_fnmatch.obj"
161 -@erase "$(INTDIR)\ap_md5c.obj"
162 + -@erase "$(INTDIR)\ap_hook.obj"
163 + -@erase "$(INTDIR)\ap_ctx.obj"
164 + -@erase "$(INTDIR)\ap_mm.obj"
165 -@erase "$(INTDIR)\ap_sha1.obj"
166 -@erase "$(INTDIR)\ap_signal.obj"
167 -@erase "$(INTDIR)\ap_slack.obj"
169 "$(INTDIR)\ap_cpystrn.obj" \
170 "$(INTDIR)\ap_fnmatch.obj" \
171 "$(INTDIR)\ap_md5c.obj" \
172 + "$(INTDIR)\ap_hook.obj" \
173 + "$(INTDIR)\ap_ctx.obj" \
174 + "$(INTDIR)\ap_mm.obj" \
175 "$(INTDIR)\ap_sha1.obj" \
176 "$(INTDIR)\ap_signal.obj" \
177 "$(INTDIR)\ap_slack.obj" \
179 -@erase "$(INTDIR)\ap_cpystrn.obj"
180 -@erase "$(INTDIR)\ap_fnmatch.obj"
181 -@erase "$(INTDIR)\ap_md5c.obj"
182 + -@erase "$(INTDIR)\ap_hook.obj"
183 + -@erase "$(INTDIR)\ap_ctx.obj"
184 + -@erase "$(INTDIR)\ap_mm.obj"
185 -@erase "$(INTDIR)\ap_sha1.obj"
186 -@erase "$(INTDIR)\ap_signal.obj"
187 -@erase "$(INTDIR)\ap_slack.obj"
189 "$(INTDIR)\ap_cpystrn.obj" \
190 "$(INTDIR)\ap_fnmatch.obj" \
191 "$(INTDIR)\ap_md5c.obj" \
192 + "$(INTDIR)\ap_hook.obj" \
193 + "$(INTDIR)\ap_ctx.obj" \
194 + "$(INTDIR)\ap_mm.obj" \
195 "$(INTDIR)\ap_sha1.obj" \
196 "$(INTDIR)\ap_signal.obj" \
197 "$(INTDIR)\ap_slack.obj" \
199 +---------------------------------------------------------------------------
200 | Replace the MODULE_MAGIC_COOKIE to allow us to distinguish between
201 | EAPI-aware modules and standard modules.
202 +---------------------------------------------------------------------------
203 Index: src/include/ap_mmn.h
204 --- src/include/ap_mmn.h 2001/01/23 11:35:07 1.1.1.8
205 +++ src/include/ap_mmn.h 2001/01/23 11:48:05 1.8
207 * 19990320.10 - add ap_is_rdirectory() and ap_stripprefix()
211 + * Under Extended API situations we replace the magic cookie "AP13" with
212 + * "EAPI" to let us distinguish between the EAPI module structure (which
213 + * contain additional pointers at the end) and standard module structures
214 + * (which lack at least NULL's for the pointers at the end). This is
215 + * important because standard ("AP13") modules would dump core when we
216 + * dispatch over the additional hooks because NULL's are missing at the end of
217 + * the module structure. See also the code in mod_so for details on loading
218 + * (we accept both "AP13" and "EAPI").
221 +#define MODULE_MAGIC_COOKIE_AP13 0x41503133UL /* "AP13" */
222 +#define MODULE_MAGIC_COOKIE_EAPI 0x45415049UL /* "EAPI" */
223 +#define MODULE_MAGIC_COOKIE MODULE_MAGIC_COOKIE_EAPI
225 #define MODULE_MAGIC_COOKIE 0x41503133UL /* "AP13" */
228 #ifndef MODULE_MAGIC_NUMBER_MAJOR
229 #define MODULE_MAGIC_NUMBER_MAJOR 19990320
231 +---------------------------------------------------------------------------
232 | Add the additional prototypes and defines for the
233 | shared memory pools.
234 +---------------------------------------------------------------------------
235 Index: src/include/ap_alloc.h
236 --- src/include/ap_alloc.h 2001/02/28 19:40:47 1.1.1.3
237 +++ src/include/ap_alloc.h 2001/02/28 19:44:33 1.4
239 pool * ap_init_alloc(void); /* Set up everything */
240 void ap_cleanup_alloc(void);
241 API_EXPORT(pool *) ap_make_sub_pool(pool *); /* All pools are subpools of permanent_pool */
243 +typedef enum { AP_POOL_RD, AP_POOL_RW } ap_pool_lock_mode;
244 +int ap_shared_pool_possible(void);
245 +void ap_init_alloc_shared(int);
246 +void ap_kill_alloc_shared(void);
247 +API_EXPORT(pool *) ap_make_shared_sub_pool(pool *);
248 +API_EXPORT(int) ap_acquire_pool(pool *, ap_pool_lock_mode);
249 +API_EXPORT(int) ap_release_pool(pool *);
251 API_EXPORT(void) ap_destroy_pool(pool *);
253 /* pools have nested lifetimes -- sub_pools are destroyed when the
255 +---------------------------------------------------------------------------
256 | Add the additional context variable `ctx' for BUFF structures.
257 +---------------------------------------------------------------------------
258 Index: src/include/buff.h
259 --- src/include/buff.h 2001/01/23 11:35:07 1.1.1.4
260 +++ src/include/buff.h 2001/01/23 11:48:05 1.8
262 /* transport handle, for RPC binding handle or some such */
273 /* Internal routines */
274 API_EXPORT(int) ap_bflsbuf(int c, BUFF *fb);
275 API_EXPORT(int) ap_bfilbuf(BUFF *fb);
278 +#define ap_bpeekc(fb) ( ((fb)->incnt == 0) ? EOF : *((fb)->inptr) )
281 #ifndef CHARSET_EBCDIC
284 +---------------------------------------------------------------------------
285 | Add the four additional Apache API module hooks.
286 +---------------------------------------------------------------------------
287 Index: src/include/http_config.h
288 --- src/include/http_config.h 2001/01/23 11:35:07 1.1.1.8
289 +++ src/include/http_config.h 2001/01/23 11:48:05 1.10
291 void (*child_exit) (server_rec *, pool *);
293 int (*post_read_request) (request_rec *);
297 + * ANSI C guarantees us that we can at least _extend_ the module structure
298 + * with additional hooks without the need to change all existing modules.
299 + * Because: ``If there are fewer initializers in the list than members of
300 + * the structure, the trailing members are initialized with 0.'' (The C
301 + * Programming Language, 2nd Ed., A8.7 Initialization). So we just
302 + * have to put our additional hooks here:
305 + * Called from within ap_add_module() right after the module structure
306 + * was linked into the Apache internal module list. It is mainly
307 + * intended to be used to define configuration defines (<IfDefine>)
308 + * which have to be available directly after a LoadModule/AddModule.
309 + * Actually this is the earliest possible hook a module can use.
312 + * Called from within ap_remove_module() right before the module
313 + * structure is kicked out from the Apache internal module list.
314 + * Actually this is last possible hook a module can use and exists for
315 + * consistency with the add_module hook.
318 + * Called right after a configuration directive line was read and
319 + * before it is processed. It is mainly intended to be used for
320 + * rewriting directives in order to provide backward compatibility to
321 + * old directive variants.
324 + * Called from within the internal new_connection() function, right
325 + * after the conn_rec structure for the new established connection was
326 + * created and before Apache starts processing the request with
327 + * ap_read_request(). It is mainly intended to be used to setup/run
328 + * connection dependent things like sending start headers for
329 + * on-the-fly compression, etc.
331 + * close_connection:
332 + * Called from within the Apache dispatching loop just before any
333 + * ap_bclose() is performed on the socket connection, but a long time
334 + * before any pool cleanups are done for the connection (which can be
335 + * too late for some applications). It is mainly intended to be used
336 + * to close/finalize connection dependent things like sending end
337 + * headers for on-the-fly compression, etc.
339 +#ifdef ULTRIX_BRAIN_DEATH
340 + void (*add_module) ();
341 + void (*remove_module) ();
342 + char *(*rewrite_command) ();
343 + void (*new_connection) ();
344 + void (*close_connection) ();
346 + void (*add_module) (struct module_struct *);
347 + void (*remove_module) (struct module_struct *);
348 + char *(*rewrite_command) (cmd_parms *, void *config, const char *);
349 + void (*new_connection) (conn_rec *);
350 + void (*close_connection) (conn_rec *);
355 /* Initializer for the first few module slots, which are only
357 +---------------------------------------------------------------------------
358 | Add the additional variable `ap_global_ctx' for holding
359 | global module context.
360 +---------------------------------------------------------------------------
361 Index: src/include/http_conf_globals.h
362 --- src/include/http_conf_globals.h 2001/10/16 11:47:12 1.1.1.9
363 +++ src/include/http_conf_globals.h 2001/10/16 11:57:38 1.10
366 extern int ap_dump_settings;
367 extern API_VAR_EXPORT int ap_extended_status;
369 +extern API_VAR_EXPORT ap_ctx *ap_global_ctx;
372 extern API_VAR_EXPORT char *ap_pid_fname;
373 extern API_VAR_EXPORT char *ap_scoreboard_fname;
375 +---------------------------------------------------------------------------
376 | Export the ap_set_callback_and_alarm() function because this
377 | first is a useful thing and second we need it because all
378 | other API/timeout functions deal with a request_rec while
379 | some modules need a generic timeout mechanism.
380 +---------------------------------------------------------------------------
381 Index: src/include/http_main.h
382 --- src/include/http_main.h 2001/10/16 11:47:12 1.1.1.6
383 +++ src/include/http_main.h 2001/10/16 11:57:38 1.6
385 API_EXPORT(void) ap_sync_scoreboard_image(void);
386 int ap_update_child_status(int child_num, int status, request_rec *r);
387 void ap_time_process_request(int child_num, int status);
389 +API_EXPORT(unsigned int) ap_set_callback_and_alarm(void (*fn) (int), int x);
391 unsigned int ap_set_callback_and_alarm(void (*fn) (int), int x);
393 API_EXPORT(int) ap_check_alarm(void);
395 void setup_signal_names(char *prefix);
397 +---------------------------------------------------------------------------
398 | First add support for the HTTPS protocol scheme via hooks,
399 | second add the additional context variable `ctx' for the
400 | conn_rec, server_rec and request_rec structures. And third
401 | add a prototype for the additional ap_add_config_define()
403 +---------------------------------------------------------------------------
404 Index: src/include/httpd.h
405 --- src/include/httpd.h 2001/10/16 11:47:12 1.1.1.16
406 +++ src/include/httpd.h 2001/10/16 11:57:38 1.26
408 /* Headers in which EVERYONE has an interest... */
410 #include "ap_config.h"
414 #include "ap_alloc.h"
416 + * Include the Extended API headers.
417 + * Don't move the position. It has to be after ap_alloc.h because it uses the
418 + * pool stuff but before buff.h because the buffer stuff uses the EAPI, too.
421 +#include "ap_hook.h"
427 @@ -141,12 +153,17 @@
428 #define DEFAULT_HTTP_PORT 80
429 #define DEFAULT_HTTPS_PORT 443
430 #define ap_is_default_port(port,r) ((port) == ap_default_port(r))
432 +#define ap_http_method(r) (((r)->ctx != NULL && ap_ctx_get((r)->ctx, "ap::http::method") != NULL) ? ((char *)ap_ctx_get((r)->ctx, "ap::http::method")) : "http")
433 +#define ap_default_port(r) (((r)->ctx != NULL && ap_ctx_get((r)->ctx, "ap::default::port") != NULL) ? atoi((char *)ap_ctx_get((r)->ctx, "ap::default::port")) : DEFAULT_HTTP_PORT)
436 #define ap_http_method(r) ap_os_http_method(r)
438 #define ap_http_method(r) "http"
440 #define ap_default_port(r) DEFAULT_HTTP_PORT
443 /* --------- Default user name and group name running standalone ---------- */
444 /* --- These may be specified as numbers by placing a # before a number --- */
446 #define SCOREBOARD_MAINTENANCE_INTERVAL 1000000
451 + * Path to Shared Memory Files
454 +#ifndef EAPI_MM_CORE_PATH
455 +#define EAPI_MM_CORE_PATH "logs/mm"
457 +#ifndef EAPI_MM_CORE_MAXSIZE
458 +#define EAPI_MM_CORE_MAXSIZE 1024*1024*1 /* max. 1MB */
462 /* Number of requests to try to handle in a single process. If <= 0,
463 * the children don't die off. That's the default here, since I'm still
464 * interested in finding and stanching leaks.
466 API_EXPORT(const char *) ap_get_server_version(void);
467 API_EXPORT(void) ap_add_version_component(const char *component);
468 API_EXPORT(const char *) ap_get_server_built(void);
470 +API_EXPORT(void) ap_add_config_define(const char *define);
473 /* Numeric release version identifier: MMNNFFRBB: major minor fix final beta
474 * Always increases along the same track as the source branch.
476 * record to improve 64bit alignment the next time we need to break
477 * binary compatibility for some other reason.
487 char *local_host; /* used for ap_get_server_name when
488 * UseCanonicalName is set to DNS
489 * (ignores setting of HostnameLookups) */
495 /* Per-vhost config... */
496 @@ -975,6 +1015,10 @@
497 int limit_req_line; /* limit on size of the HTTP request line */
498 int limit_req_fieldsize; /* limit on size of any request header field */
499 int limit_req_fields; /* limit on number of request header fields */
506 /* These are more like real hosts than virtual hosts */
508 +---------------------------------------------------------------------------
509 | Patch the shared memory pool support into the Apache pool facility.
510 +---------------------------------------------------------------------------
511 Index: src/main/alloc.c
512 --- src/main/alloc.c 2001/01/23 11:35:08 1.1.1.10
513 +++ src/main/alloc.c 2001/01/23 11:48:05 1.17
519 +#include "http_config.h"
520 +#include "http_conf_globals.h"
522 #include "multithread.h"
523 #include "http_log.h"
526 #define BLOCK_MINALLOC 0
529 +#if defined(EAPI) && defined(EAPI_MM)
530 +static AP_MM *mm = NULL;
533 /*****************************************************************
535 * Managing free storage blocks...
538 union block_hdr *next;
540 +#if defined(EAPI) && defined(EAPI_MM)
544 union block_hdr *global_next;
545 struct pool *owning_pool;
547 /* Get a completely new block from the system pool. Note that we rely on
548 malloc() to provide aligned memory. */
550 +#if defined(EAPI) && defined(EAPI_MM)
551 +static union block_hdr *malloc_block(int size, int is_shm)
553 static union block_hdr *malloc_block(int size)
556 union block_hdr *blok;
558 @@ -230,12 +245,20 @@
560 num_malloc_bytes += size + sizeof(union block_hdr);
562 +#if defined(EAPI) && defined(EAPI_MM)
564 + blok = (union block_hdr *)ap_mm_malloc(mm, size + sizeof(union block_hdr));
567 blok = (union block_hdr *) malloc(size + sizeof(union block_hdr));
569 fprintf(stderr, "Ouch! malloc failed in malloc_block()\n");
572 debug_fill(blok, size + sizeof(union block_hdr));
573 +#if defined(EAPI) && defined(EAPI_MM)
574 + blok->h.is_shm = is_shm;
577 blok->h.first_avail = (char *) (blok + 1);
578 blok->h.endp = size + blok->h.first_avail;
581 return; /* Sanity check --- freeing empty pool? */
583 +#if defined(EAPI) && defined(EAPI_MM)
584 + if (blok->h.is_shm)
585 + (void)ap_mm_lock(mm, AP_MM_LOCK_RW);
587 (void) ap_acquire_mutex(alloc_mutex);
588 old_free_list = block_freelist;
589 block_freelist = blok;
593 (void) ap_release_mutex(alloc_mutex);
594 +#if defined(EAPI) && defined(EAPI_MM)
595 + if (blok->h.is_shm)
596 + (void)ap_mm_unlock(mm);
603 * if necessary. Must be called with alarms blocked.
606 +#if defined(EAPI) && defined(EAPI_MM)
607 +static union block_hdr *new_block(int min_size, int is_shm)
609 static union block_hdr *new_block(int min_size)
612 union block_hdr **lastptr = &block_freelist;
613 union block_hdr *blok = block_freelist;
617 while (blok != NULL) {
618 +#if defined(EAPI) && defined(EAPI_MM)
619 + if (blok->h.is_shm == is_shm &&
620 + min_size + BLOCK_MINFREE <= blok->h.endp - blok->h.first_avail) {
622 if (min_size + BLOCK_MINFREE <= blok->h.endp - blok->h.first_avail) {
624 *lastptr = blok->h.next;
626 debug_verify_filled(blok->h.first_avail, blok->h.endp,
630 min_size += BLOCK_MINFREE;
631 +#if defined(EAPI) && defined(EAPI_MM)
632 + blok = malloc_block((min_size > BLOCK_MINALLOC) ? min_size : BLOCK_MINALLOC, is_shm);
634 blok = malloc_block((min_size > BLOCK_MINALLOC) ? min_size : BLOCK_MINALLOC);
643 +#if defined(EAPI) && defined(EAPI_MM)
648 static pool *permanent_pool;
649 @@ -440,16 +487,28 @@
650 #define POOL_HDR_CLICKS (1 + ((sizeof(struct pool) - 1) / CLICK_SZ))
651 #define POOL_HDR_BYTES (POOL_HDR_CLICKS * CLICK_SZ)
653 +#if defined(EAPI) && defined(EAPI_MM)
654 +static struct pool *make_sub_pool_internal(struct pool *p, int is_shm)
656 API_EXPORT(struct pool *) ap_make_sub_pool(struct pool *p)
659 union block_hdr *blok;
664 +#if defined(EAPI) && defined(EAPI_MM)
666 + (void)ap_mm_lock(mm, AP_MM_LOCK_RW);
668 (void) ap_acquire_mutex(alloc_mutex);
670 +#if defined(EAPI) && defined(EAPI_MM)
671 + blok = new_block(POOL_HDR_BYTES, is_shm);
673 blok = new_block(POOL_HDR_BYTES);
675 new_pool = (pool *) blok->h.first_avail;
676 blok->h.first_avail += POOL_HDR_BYTES;
678 @@ -468,12 +527,38 @@
679 p->sub_pools = new_pool;
682 +#if defined(EAPI) && defined(EAPI_MM)
683 + new_pool->is_shm = is_shm;
686 (void) ap_release_mutex(alloc_mutex);
687 +#if defined(EAPI) && defined(EAPI_MM)
689 + (void)ap_mm_unlock(mm);
697 +#if defined(EAPI_MM)
698 +API_EXPORT(struct pool *) ap_make_sub_pool(struct pool *p)
700 + return make_sub_pool_internal(p, 0);
702 +API_EXPORT(struct pool *) ap_make_shared_sub_pool(struct pool *p)
704 + return make_sub_pool_internal(p, 1);
707 +API_EXPORT(struct pool *) ap_make_shared_sub_pool(struct pool *p)
715 static void stack_var_init(char *s)
722 +int ap_shared_pool_possible(void)
724 + return ap_mm_useable();
729 static void dump_stats(void)
732 return permanent_pool;
736 +void ap_init_alloc_shared(int early)
738 +#if defined(EAPI_MM)
744 + /* process very early on startup */
745 + mm_size = ap_mm_maxsize();
746 + if (mm_size > EAPI_MM_CORE_MAXSIZE)
747 + mm_size = EAPI_MM_CORE_MAXSIZE;
748 + mm_path = ap_server_root_relative(permanent_pool,
749 + ap_psprintf(permanent_pool, "%s.%ld",
750 + EAPI_MM_CORE_PATH, (long)getpid()));
751 + if ((mm = ap_mm_create(mm_size, mm_path)) == NULL) {
752 + fprintf(stderr, "Ouch! ap_mm_create(%d, \"%s\") failed\n", mm_size, mm_path);
753 + err1 = ap_mm_error();
755 + err1 = "-unknown-";
756 + err2 = strerror(errno);
758 + err2 = "-unknown-";
759 + fprintf(stderr, "Error: MM: %s: OS: %s\n", err1, err2);
764 + /* process a lot later on startup */
766 + ap_mm_permission(mm, (_S_IREAD|_S_IWRITE), ap_user_id, -1);
768 + ap_mm_permission(mm, (S_IRUSR|S_IWUSR), ap_user_id, -1);
771 +#endif /* EAPI_MM */
775 +void ap_kill_alloc_shared(void)
777 +#if defined(EAPI_MM)
782 +#endif /* EAPI_MM */
787 void ap_cleanup_alloc(void)
789 ap_destroy_mutex(alloc_mutex);
790 @@ -530,10 +674,18 @@
794 +#if defined(EAPI) && defined(EAPI_MM)
796 + (void)ap_mm_lock(mm, AP_MM_LOCK_RW);
798 (void) ap_acquire_mutex(alloc_mutex);
800 ap_destroy_pool(a->sub_pools);
801 (void) ap_release_mutex(alloc_mutex);
802 +#if defined(EAPI) && defined(EAPI_MM)
804 + (void)ap_mm_unlock(mm);
806 /* Don't hold the mutex during cleanups. */
807 run_cleanups(a->cleanups);
813 +#if defined(EAPI) && defined(EAPI_MM)
815 + (void)ap_mm_lock(mm, AP_MM_LOCK_RW);
817 (void) ap_acquire_mutex(alloc_mutex);
819 if (a->parent->sub_pools == a)
821 a->sub_next->sub_prev = a->sub_prev;
823 (void) ap_release_mutex(alloc_mutex);
824 +#if defined(EAPI) && defined(EAPI_MM)
826 + (void)ap_mm_unlock(mm);
829 free_blocks(a->first);
832 return bytes_in_block_list(block_freelist);
836 +API_EXPORT(int) ap_acquire_pool(pool *p, ap_pool_lock_mode mode)
838 +#if defined(EAPI_MM)
841 + return ap_mm_lock(mm, mode == AP_POOL_RD ? AP_MM_LOCK_RD : AP_MM_LOCK_RW);
847 +API_EXPORT(int) ap_release_pool(pool *p)
849 +#if defined(EAPI_MM)
852 + return ap_mm_unlock(mm);
859 /*****************************************************************
862 @@ -756,16 +940,31 @@
866 +#if defined(EAPI) && defined(EAPI_MM)
868 + (void)ap_mm_lock(mm, AP_MM_LOCK_RW);
870 (void) ap_acquire_mutex(alloc_mutex);
872 +#if defined(EAPI) && defined(EAPI_MM)
873 + blok = new_block(size, a->is_shm);
875 blok = new_block(size);
877 a->last->h.next = blok;
880 blok->h.owning_pool = a;
882 +#if defined(EAPI) && defined(EAPI_MM)
883 + blok->h.is_shm = a->is_shm;
886 (void) ap_release_mutex(alloc_mutex);
887 +#if defined(EAPI) && defined(EAPI_MM)
889 + (void)ap_mm_unlock(mm);
894 @@ -877,6 +1076,11 @@
897 size = (char *)ps->vbuff.curpos - ps->base;
898 +#if defined(EAPI) && defined(EAPI_MM)
899 + if (ps->block->h.is_shm)
900 + ptr = ap_mm_realloc(ps->base, 2*size);
903 ptr = realloc(ps->base, 2*size);
905 fputs("Ouch! Out of memory!\n", stderr);
906 @@ -897,9 +1101,21 @@
907 cur_len = strp - blok->h.first_avail;
909 /* must try another blok */
910 +#if defined(EAPI) && defined(EAPI_MM)
911 + if (blok->h.is_shm)
912 + (void)ap_mm_lock(mm, AP_MM_LOCK_RW);
914 (void) ap_acquire_mutex(alloc_mutex);
915 +#if defined(EAPI) && defined(EAPI_MM)
916 + nblok = new_block(2 * cur_len, blok->h.is_shm);
918 nblok = new_block(2 * cur_len);
920 (void) ap_release_mutex(alloc_mutex);
921 +#if defined(EAPI) && defined(EAPI_MM)
922 + if (blok->h.is_shm)
923 + (void)ap_mm_unlock(mm);
925 memcpy(nblok->h.first_avail, blok->h.first_avail, cur_len);
926 ps->vbuff.curpos = nblok->h.first_avail + cur_len;
927 /* save a byte for the NUL terminator */
928 @@ -908,10 +1124,18 @@
929 /* did we allocate the current blok? if so free it up */
930 if (ps->got_a_new_block) {
931 debug_fill(blok->h.first_avail, blok->h.endp - blok->h.first_avail);
932 +#if defined(EAPI) && defined(EAPI_MM)
933 + if (blok->h.is_shm)
934 + (void)ap_mm_lock(mm, AP_MM_LOCK_RW);
936 (void) ap_acquire_mutex(alloc_mutex);
937 blok->h.next = block_freelist;
938 block_freelist = blok;
939 (void) ap_release_mutex(alloc_mutex);
940 +#if defined(EAPI) && defined(EAPI_MM)
941 + if (blok->h.is_shm)
942 + (void)ap_mm_unlock(mm);
946 ps->got_a_new_block = 1;
947 @@ -930,6 +1154,11 @@
951 +#if defined(EAPI) && defined(EAPI_MM)
953 + ps.base = ap_mm_malloc(mm, 512);
956 ps.base = malloc(512);
957 if (ps.base == NULL) {
958 fputs("Ouch! Out of memory!\n", stderr);
959 @@ -942,6 +1171,11 @@
960 *ps.vbuff.curpos++ = '\0';
963 +#if defined(EAPI) && defined(EAPI_MM)
965 + ptr = ap_mm_realloc(ptr, (char *)ps.vbuff.curpos - (char *)ptr);
968 ptr = realloc(ptr, (char *)ps.vbuff.curpos - (char *)ptr);
970 fputs("Ouch! Out of memory!\n", stderr);
972 +---------------------------------------------------------------------------
973 | Patch the low-level buffer routines to additionally allow
974 | modules to intercept the I/O processing via hooks.
975 +---------------------------------------------------------------------------
976 Index: src/main/buff.c
977 --- src/main/buff.c 2001/01/23 11:35:08 1.1.1.10
978 +++ src/main/buff.c 2001/01/23 11:48:05 1.18
980 select() sometimes returns 1 even though the write will block. We must work around this.
984 +API_EXPORT(int) sendwithtimeout(int sock, const char *buf, int len, int flags)
986 int sendwithtimeout(int sock, const char *buf, int len, int flags)
997 +API_EXPORT(int) recvwithtimeout(int sock, char *buf, int len, int flags)
999 int recvwithtimeout(int sock, char *buf, int len, int flags)
1009 + if (!ap_hook_call("ap::buff::read", &rv, fb, buf, nbyte))
1011 rv = read(fb->fd_in, buf, nbyte);
1016 #if defined (WIN32) || defined(NETWARE)
1017 if (fb->flags & B_SOCKET) {
1019 + if (!ap_hook_call("ap::buff::recvwithtimeout", &rv, fb, buf, nbyte))
1021 rv = recvwithtimeout(fb->fd_in, buf, nbyte, 0);
1022 if (rv == SOCKET_ERROR)
1023 errno = WSAGetLastError();
1029 + if (!ap_hook_call("ap::buff::write", &rv, fb, buf, nbyte))
1031 #if defined (B_SFIO)
1032 rv = sfwrite(fb->sf_out, buf, nbyte);
1036 #if defined(WIN32) || defined(NETWARE)
1037 if (fb->flags & B_SOCKET) {
1039 + if (!ap_hook_call("ap::buff::sendwithtimeout", &rv, fb, buf, nbyte))
1041 rv = sendwithtimeout(fb->fd, buf, nbyte, 0);
1042 if (rv == SOCKET_ERROR)
1043 errno = WSAGetLastError();
1044 @@ -438,6 +457,10 @@
1045 (size_t) SF_UNBOUND, 1, SF_WRITE);
1049 + fb->ctx = ap_ctx_new(p);
1055 @@ -1084,6 +1107,9 @@
1060 + if (!ap_hook_call("ap::buff::writev", &rv, fb, &vec[i], nvec -i))
1062 rv = writev(fb->fd, &vec[i], nvec - i);
1063 while (rv == -1 && (errno == EINTR || errno == EAGAIN)
1064 && !(fb->flags & B_EOUT));
1066 +---------------------------------------------------------------------------
1067 | Add the implementation of the additional `add_module' and
1068 | `rewrite_command' module hooks. Additionally the `ctx'
1069 | variables are initialized.
1070 +---------------------------------------------------------------------------
1071 Index: src/main/http_config.c
1072 --- src/main/http_config.c 2001/10/16 11:47:13 1.1.1.12
1073 +++ src/main/http_config.c 2001/10/16 11:57:38 1.15
1074 @@ -599,6 +599,20 @@
1077 #endif /*_OSD_POSIX*/
1081 + * Invoke the `add_module' hook inside the now existing set
1082 + * of modules to let them all now that this module was added.
1086 + for (m2 = top_module; m2 != NULL; m2 = m2->next)
1087 + if (m2->magic == MODULE_MAGIC_COOKIE_EAPI)
1088 + if (m2->add_module != NULL)
1089 + (*m2->add_module)(m);
1095 @@ -613,6 +627,21 @@
1101 + * Invoke the `remove_module' hook inside the now existing
1102 + * set of modules to let them all now that this module is
1107 + for (m2 = top_module; m2 != NULL; m2 = m2->next)
1108 + if (m2->magic == MODULE_MAGIC_COOKIE_EAPI)
1109 + if (m2->remove_module != NULL)
1110 + (*m2->remove_module)(m);
1116 /* We are the top module, special case */
1117 @@ -1006,6 +1035,27 @@
1118 const command_rec *cmd;
1119 module *mod = top_module;
1123 + * Invoke the `rewrite_command' of modules to allow
1124 + * they to rewrite the directive line before we
1130 + for (m = top_module; m != NULL; m = m->next) {
1131 + if (m->magic == MODULE_MAGIC_COOKIE_EAPI) {
1132 + if (m->rewrite_command != NULL) {
1133 + cp = (m->rewrite_command)(parms, config, l);
1142 if ((l[0] == '#') || (!l[0]))
1145 @@ -1440,6 +1490,10 @@
1146 s->limit_req_fieldsize = main_server->limit_req_fieldsize;
1147 s->limit_req_fields = main_server->limit_req_fields;
1150 + s->ctx = ap_ctx_new(p);
1155 return ap_parse_vhost_addrs(p, hostname, s);
1156 @@ -1550,6 +1604,10 @@
1158 s->module_config = create_server_config(p, s);
1159 s->lookup_defaults = create_default_per_dir_config(p);
1162 + s->ctx = ap_ctx_new(p);
1168 +---------------------------------------------------------------------------
1169 | Add the ap_global_ctx variable and the new
1170 | ap_add_config_define() function. Additionally the
1171 | implementation of the additional `new_connection' module hook
1172 | is added plus the initialization of one more `ctx' variable.
1173 +---------------------------------------------------------------------------
1174 Index: src/main/http_main.c
1175 --- src/main/http_main.c 2001/10/16 11:47:14 1.1.1.15
1176 +++ src/main/http_main.c 2001/10/16 11:57:39 1.37
1179 int ap_dump_settings = 0;
1180 API_VAR_EXPORT int ap_extended_status = 0;
1182 +API_VAR_EXPORT ap_ctx *ap_global_ctx;
1186 * The max child slot ever assigned, preserved across restarts. Necessary
1187 @@ -462,6 +465,30 @@
1192 +API_EXPORT(void) ap_add_config_define(const char *define)
1195 + var = (char **)ap_push_array(ap_server_config_defines);
1196 + *var = ap_pstrdup(pcommands, define);
1201 + * Invoke the `close_connection' hook of modules to let them do
1202 + * some connection dependent actions before we close it.
1204 +static void ap_call_close_connection_hook(conn_rec *c)
1207 + for (m = top_module; m != NULL; m = m->next)
1208 + if (m->magic == MODULE_MAGIC_COOKIE_EAPI)
1209 + if (m->close_connection != NULL)
1210 + (*m->close_connection)(c);
1216 static APACHE_TLS int volatile exit_after_unblock = 0;
1218 @@ -1435,6 +1462,10 @@
1219 ap_log_transaction(log_req);
1223 + ap_call_close_connection_hook(save_req->connection);
1226 ap_bsetflag(save_req->connection->client, B_EOUT, 1);
1227 ap_bclose(save_req->connection->client);
1229 @@ -1443,6 +1474,9 @@
1230 ap_longjmp(jmpbuffer, 1);
1232 else { /* abort the connection */
1234 + ap_call_close_connection_hook(current_conn);
1236 ap_bsetflag(current_conn->client, B_EOUT, 1);
1237 ap_bclose(current_conn->client);
1238 current_conn->aborted = 1;
1239 @@ -1508,7 +1542,11 @@
1244 +API_EXPORT(unsigned int) ap_set_callback_and_alarm(void (*fn) (int), int x)
1246 unsigned int ap_set_callback_and_alarm(void (*fn) (int), int x)
1251 @@ -1744,10 +1782,16 @@
1252 /* Send any leftover data to the client, but never try to again */
1254 if (ap_bflush(r->connection->client) == -1) {
1256 + ap_call_close_connection_hook(r->connection);
1259 ap_bclose(r->connection->client);
1263 + ap_call_close_connection_hook(r->connection);
1265 ap_bsetflag(r->connection->client, B_EOUT, 1);
1267 /* Close our half of the connection --- send the client a FIN */
1268 @@ -2475,6 +2519,9 @@
1269 /* Clear the pool - including any registered cleanups */
1270 ap_destroy_pool(pglobal);
1273 + ap_kill_alloc_shared();
1278 @@ -3469,6 +3516,24 @@
1279 conn->remote_addr = *remaddr;
1280 conn->remote_ip = ap_pstrdup(conn->pool,
1281 inet_ntoa(conn->remote_addr.sin_addr));
1283 + conn->ctx = ap_ctx_new(conn->pool);
1288 + * Invoke the `new_connection' hook of modules to let them do
1289 + * some connection dependent actions before we go on with
1290 + * processing the request on this connection.
1294 + for (m = top_module; m != NULL; m = m->next)
1295 + if (m->magic == MODULE_MAGIC_COOKIE_EAPI)
1296 + if (m->new_connection != NULL)
1297 + (*m->new_connection)(conn);
1303 @@ -3891,6 +3956,15 @@
1304 printf("Server's Module Magic Number: %u:%u\n",
1305 MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
1306 printf("Server compiled with....\n");
1308 + printf(" -D EAPI\n");
1311 + printf(" -D EAPI_MM\n");
1312 +#ifdef EAPI_MM_CORE_PATH
1313 + printf(" -D EAPI_MM_CORE_PATH=\"" EAPI_MM_CORE_PATH "\"\n");
1317 show_os_specific_compile_settings();
1319 @@ -4057,6 +4131,22 @@
1320 ap_server_pre_read_config = ap_make_array(pcommands, 1, sizeof(char *));
1321 ap_server_post_read_config = ap_make_array(pcommands, 1, sizeof(char *));
1322 ap_server_config_defines = ap_make_array(pcommands, 1, sizeof(char *));
1326 + ap_hook_configure("ap::buff::read",
1327 + AP_HOOK_SIG4(int,ptr,ptr,int), AP_HOOK_TOPMOST);
1328 + ap_hook_configure("ap::buff::write",
1329 + AP_HOOK_SIG4(int,ptr,ptr,int), AP_HOOK_TOPMOST);
1330 + ap_hook_configure("ap::buff::writev",
1331 + AP_HOOK_SIG4(int,ptr,ptr,int), AP_HOOK_TOPMOST);
1332 + ap_hook_configure("ap::buff::sendwithtimeout",
1333 + AP_HOOK_SIG4(int,ptr,ptr,int), AP_HOOK_TOPMOST);
1334 + ap_hook_configure("ap::buff::recvwithtimeout",
1335 + AP_HOOK_SIG4(int,ptr,ptr,int), AP_HOOK_TOPMOST);
1337 + ap_global_ctx = ap_ctx_new(NULL);
1342 @@ -4476,6 +4566,9 @@
1344 ap_sync_scoreboard_image();
1345 if (ap_scoreboard_image->global.running_generation != ap_my_generation) {
1347 + ap_call_close_connection_hook(current_conn);
1350 clean_child_exit(0);
1352 @@ -4504,6 +4597,9 @@
1357 + ap_call_close_connection_hook(current_conn);
1359 ap_bclose(conn_io); /* just close it */
1361 if (r && r->connection
1362 @@ -4514,6 +4610,9 @@
1367 + ap_call_close_connection_hook(current_conn);
1369 ap_bsetflag(conn_io, B_EOUT, 1);
1372 @@ -5273,16 +5372,31 @@
1377 + ap_init_alloc_shared(TRUE);
1380 ap_suexec_enabled = init_suexec();
1381 server_conf = ap_read_config(pconf, ptrans, ap_server_confname);
1384 + ap_init_alloc_shared(FALSE);
1387 if (ap_configtestonly) {
1388 fprintf(stderr, "Syntax OK\n");
1390 + clean_parent_exit(0);
1395 if (ap_dump_settings) {
1397 + clean_parent_exit(0);
1403 child_timeouts = !ap_standalone || one_process;
1404 @@ -5413,6 +5527,10 @@
1405 ap_destroy_pool(r->pool);
1409 + ap_call_close_connection_hook(conn);
1415 @@ -5759,6 +5877,9 @@
1416 ap_kill_cleanups_for_socket(ptrans, csd);
1420 + ap_call_close_connection_hook(current_conn);
1422 ap_bclose(conn_io); /* just close it */
1424 if (r && r->connection
1425 @@ -5769,6 +5890,9 @@
1430 + ap_call_close_connection_hook(current_conn);
1432 ap_bsetflag(conn_io, B_EOUT, 1);
1435 @@ -7316,6 +7440,10 @@
1436 if (!conf_specified)
1437 ap_cpystrn(ap_server_confname, SERVER_CONFIG_FILE, sizeof(ap_server_confname));
1440 + ap_init_alloc_shared(TRUE);
1443 if (!ap_os_is_path_absolute(ap_server_confname))
1444 ap_cpystrn(ap_server_confname,
1445 ap_server_root_relative(pcommands, ap_server_confname),
1446 @@ -7355,6 +7483,9 @@
1448 #else /* ndef WIN32 */
1449 server_conf = ap_read_config(pconf, ptrans, ap_server_confname);
1452 + ap_init_alloc_shared(FALSE);
1455 if (ap_configtestonly) {
1457 +---------------------------------------------------------------------------
1458 | Just add the initialization of the `ctx' variable for
1459 | conn_rec structures.
1460 +---------------------------------------------------------------------------
1461 Index: src/main/http_request.c
1462 --- src/main/http_request.c 2001/05/20 08:16:18 1.1.1.12
1463 +++ src/main/http_request.c 2001/05/20 08:23:02 1.12
1464 @@ -1374,6 +1374,10 @@
1466 new->method = r->method;
1467 new->method_number = r->method_number;
1469 + /* initialize context _BEFORE_ ap_parse_uri() call */
1470 + new->ctx = r->ctx;
1472 ap_parse_uri(new, new_uri);
1473 new->request_config = ap_create_request_config(r->pool);
1474 new->per_dir_config = r->server->lookup_defaults;
1476 +---------------------------------------------------------------------------
1477 | Just add the initialization of the `ctx' variable for
1478 | request_rec structures.
1479 +---------------------------------------------------------------------------
1480 Index: src/main/http_protocol.c
1481 --- src/main/http_protocol.c 2001/10/16 11:47:14 1.1.1.14
1482 +++ src/main/http_protocol.c 2001/10/16 11:57:39 1.14
1483 @@ -1110,6 +1110,10 @@
1484 r->status = HTTP_REQUEST_TIME_OUT; /* Until we get a request */
1485 r->the_request = NULL;
1488 + r->ctx = ap_ctx_new(r->pool);
1491 #ifdef CHARSET_EBCDIC
1492 ap_bsetflag(r->connection->client, B_ASCII2EBCDIC, r->ebcdic.conv_in = 1);
1493 ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, r->ebcdic.conv_out = 1);
1494 @@ -1258,6 +1262,11 @@
1495 rnew->read_body = REQUEST_NO_BODY;
1497 rnew->main = (request_rec *) r;
1500 + rnew->ctx = r->ctx;
1505 void ap_finalize_sub_req_protocol(request_rec *sub)
1507 +---------------------------------------------------------------------------
1508 | Add support for loading both EAPI and AP13 modules.
1509 +---------------------------------------------------------------------------
1510 Index: src/modules/standard/mod_so.c
1511 --- src/modules/standard/mod_so.c 2001/05/20 08:16:21 1.1.1.7
1512 +++ src/modules/standard/mod_so.c 2001/05/20 08:23:02 1.8
1513 @@ -266,11 +266,24 @@
1514 * Make sure the found module structure is really a module structure
1518 + if ( modp->magic != MODULE_MAGIC_COOKIE_AP13
1519 + && modp->magic != MODULE_MAGIC_COOKIE_EAPI) {
1521 if (modp->magic != MODULE_MAGIC_COOKIE) {
1523 return ap_pstrcat(cmd->pool, "API module structure `", modname,
1524 "' in file ", szModuleFile, " is garbled -"
1525 " perhaps this is not an Apache module DSO?", NULL);
1528 + if (modp->magic == MODULE_MAGIC_COOKIE_AP13) {
1529 + ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, NULL,
1530 + "Loaded DSO %s uses plain Apache 1.3 API, "
1531 + "this module might crash under EAPI! "
1532 + "(please recompile it with -DEAPI)", filename);
1537 * Add this module to the Apache core structures
1539 +---------------------------------------------------------------------------
1540 | Add additional logging functions to the CustomLog directive
1541 | which can be used by other modules to create additional
1542 | logfile tags. Actually we add two types of hooks: One hook
1543 | for intercepting the new and generic %x (eXtension) tag and
1544 | one hook for creating new %x tags at all.
1545 +---------------------------------------------------------------------------
1546 Index: src/modules/standard/mod_log_config.c
1547 --- src/modules/standard/mod_log_config.c 2001/01/23 11:35:12 1.1.1.11
1548 +++ src/modules/standard/mod_log_config.c 2001/01/23 11:48:08 1.24
1550 typedef const char *(*item_key_func) (request_rec *, char *);
1558 int condition_sense;
1559 @@ -573,15 +576,36 @@
1564 +static struct log_item_list *find_log_func(pool *p, char k)
1566 static struct log_item_list *find_log_func(char k)
1571 + struct log_item_list *lil;
1574 for (i = 0; log_item_keys[i].ch; ++i)
1575 if (k == log_item_keys[i].ch) {
1576 return &log_item_keys[i];
1580 + if (ap_hook_status(ap_psprintf(p, "ap::mod_log_config::log_%c", k))
1581 + != AP_HOOK_STATE_NOTEXISTANT) {
1582 + lil = (struct log_item_list *)
1583 + ap_pcalloc(p, sizeof(struct log_item_list));
1588 + lil->want_orig_default = 0;
1596 @@ -707,7 +731,11 @@
1601 + l = find_log_func(p, *s++);
1603 l = find_log_func(*s++);
1609 return ap_pstrcat(p, "Unrecognized LogFormat directive %",
1616 if (it->want_orig == -1) {
1617 it->want_orig = l->want_orig_default;
1618 @@ -777,6 +808,15 @@
1620 /* We do. Do it... */
1623 + if (item->func == NULL) {
1625 + ap_hook_use(ap_psprintf(r->pool, "ap::mod_log_config::log_%c", item->ch),
1626 + AP_HOOK_SIG3(ptr,ptr,ptr), AP_HOOK_DECLINE(NULL),
1627 + &cp, r, item->arg);
1631 cp = (*item->func) (item->want_orig ? orig : r, item->arg);
1632 return cp ? cp : "-";
1635 +---------------------------------------------------------------------------
1636 | Allow RewriteCond and RewriteRule directives to lookup
1637 | variables from other modules.
1638 +---------------------------------------------------------------------------
1639 Index: src/modules/standard/mod_rewrite.c
1640 --- src/modules/standard/mod_rewrite.c 2001/10/16 11:47:16 1.1.1.12
1641 +++ src/modules/standard/mod_rewrite.c 2001/10/16 11:57:39 1.10
1642 @@ -3678,6 +3678,15 @@
1644 #endif /* ndef WIN32 && NETWARE*/
1648 + ap_hook_use("ap::mod_rewrite::lookup_variable",
1649 + AP_HOOK_SIG3(ptr,ptr,ptr),
1650 + AP_HOOK_DECLINE(NULL),
1655 if (result == NULL) {
1656 return ap_pstrdup(r->pool, "");
1659 +---------------------------------------------------------------------------
1660 | Add an EAPI hook to allow other modules to add content to
1661 | the status HTML page.
1662 +---------------------------------------------------------------------------
1663 Index: src/modules/standard/mod_status.c
1664 --- src/modules/standard/mod_status.c 2001/05/20 08:16:21 1.1.1.12
1665 +++ src/modules/standard/mod_status.c 2001/05/20 08:23:02 1.9
1666 @@ -715,6 +752,12 @@
1672 + ap_hook_use("ap::mod_status::display",
1673 + AP_HOOK_SIG4(void,ptr,int,int), AP_HOOK_ALL,
1674 + r, no_table_report, short_report);
1680 +---------------------------------------------------------------------------
1681 | Add hooks to the scheme processing to allow other modules to
1682 | recognize more schemes by intercepting this processing.
1683 +---------------------------------------------------------------------------
1684 Index: src/modules/proxy/mod_proxy.c
1685 --- src/modules/proxy/mod_proxy.c 2001/10/16 11:47:15 1.1.1.9
1686 +++ src/modules/proxy/mod_proxy.c 2001/10/16 11:57:39 1.16
1688 static int proxy_fixup(request_rec *r)
1695 if (r->proxyreq == NOT_PROXY || strncmp(r->filename, "proxy:", 6) != 0)
1697 @@ -222,6 +225,14 @@
1698 url = &r->filename[6];
1700 /* canonicalise each specific scheme */
1702 + if (ap_hook_use("ap::mod_proxy::canon",
1703 + AP_HOOK_SIG3(int,ptr,ptr),
1704 + AP_HOOK_DECLINE(DECLINED),
1705 + &rc, r, url) && rc != DECLINED)
1709 if (strncasecmp(url, "http:", 5) == 0)
1710 return ap_proxy_http_canon(r, url + 5, "http", DEFAULT_HTTP_PORT);
1711 else if (strncasecmp(url, "ftp:", 4) == 0)
1712 @@ -237,9 +248,44 @@
1713 static void proxy_init(server_rec *r, pool *p)
1715 ap_proxy_garbage_init(r, p);
1717 + ap_hook_use("ap::mod_proxy::init",
1718 + AP_HOOK_SIG3(void,ptr,ptr), AP_HOOK_ALL, r, p);
1724 +static void proxy_addmod(module *m)
1726 + /* export: ap_proxy_http_canon() as `ap::mod_proxy::http::canon' */
1727 + ap_hook_configure("ap::mod_proxy::http::canon",
1728 + AP_HOOK_SIG5(int,ptr,ptr,ptr,int), AP_HOOK_TOPMOST);
1729 + ap_hook_register("ap::mod_proxy::http::canon",
1730 + ap_proxy_http_canon, AP_HOOK_NOCTX);
1732 + /* export: ap_proxy_http_handler() as `ap::mod_proxy::http::handler' */
1733 + ap_hook_configure("ap::mod_proxy::http::handler",
1734 + AP_HOOK_SIG6(int,ptr,ptr,ptr,ptr,int), AP_HOOK_TOPMOST);
1735 + ap_hook_register("ap::mod_proxy::http::handler",
1736 + ap_proxy_http_handler, AP_HOOK_NOCTX);
1738 + /* export: ap_proxyerror() as `ap::mod_proxy::error' */
1739 + ap_hook_configure("ap::mod_proxy::error",
1740 + AP_HOOK_SIG3(int,ptr,ptr), AP_HOOK_TOPMOST);
1741 + ap_hook_register("ap::mod_proxy::error",
1742 + ap_proxyerror, AP_HOOK_NOCTX);
1746 +static void proxy_remmod(module *m)
1748 + /* remove the hook references */
1749 + ap_hook_unregister("ap::mod_proxy::http::canon", ap_proxy_http_canon);
1750 + ap_hook_unregister("ap::mod_proxy::http::handler", ap_proxy_http_handler);
1751 + ap_hook_unregister("ap::mod_proxy::error", ap_proxyerror);
1756 /* Send a redirection if the request contains a hostname which is not */
1757 /* fully qualified, i.e. doesn't have a domain name appended. Some proxy */
1758 @@ -369,6 +415,14 @@
1759 /* CONNECT is a special method that bypasses the normal
1763 + if (!ap_hook_use("ap::mod_proxy::handler",
1764 + AP_HOOK_SIG7(int,ptr,ptr,ptr,ptr,int,ptr),
1765 + AP_HOOK_DECLINE(DECLINED),
1767 + ents[i].hostname, ents[i].port,
1768 + ents[i].protocol) || rc == DECLINED) {
1770 if (r->method_number == M_CONNECT)
1771 rc = ap_proxy_connect_handler(r, cr, url, ents[i].hostname,
1781 /* an error or success */
1782 if (rc != DECLINED && rc != HTTP_BAD_GATEWAY)
1783 @@ -391,6 +448,14 @@
1786 /* handle the scheme */
1788 + if (ap_hook_use("ap::mod_proxy::handler",
1789 + AP_HOOK_SIG7(int,ptr,ptr,ptr,ptr,int,ptr),
1790 + AP_HOOK_DECLINE(DECLINED),
1792 + NULL, 0, scheme) && rc != DECLINED)
1795 if (r->method_number == M_CONNECT)
1796 return ap_proxy_connect_handler(r, cr, url, NULL, 0);
1797 if (strcasecmp(scheme, "http") == 0)
1798 @@ -955,6 +1020,12 @@
1799 NULL, /* child_init */
1800 NULL, /* child_exit */
1801 proxy_detect /* post read-request */
1803 + ,proxy_addmod, /* EAPI: add_module */
1804 + proxy_remmod, /* EAPI: remove_module */
1805 + NULL, /* EAPI: rewrite_command */
1806 + NULL /* EAPI: new_connection */
1812 +---------------------------------------------------------------------------
1813 | Add hooks to the HTTP processing to allow other modules
1814 | to enhance it by intercepting this processing.
1815 +---------------------------------------------------------------------------
1816 Index: src/modules/proxy/proxy_http.c
1817 --- src/modules/proxy/proxy_http.c 2001/10/16 11:47:15 1.1.1.11
1818 +++ src/modules/proxy/proxy_http.c 2001/10/16 11:57:39 1.19
1820 const char *urlptr = NULL;
1821 const char *datestr;
1822 struct tbl_do_args tdo;
1827 void *sconf = r->server->module_config;
1828 proxy_server_conf *conf =
1829 @@ -208,6 +211,12 @@
1830 return HTTP_BAD_REQUEST;
1832 destport = DEFAULT_HTTP_PORT;
1834 + ap_hook_use("ap::mod_proxy::http::handler::set_destport",
1835 + AP_HOOK_SIG2(int,ptr),
1839 strp = strchr(urlptr, '/');
1841 desthost = ap_pstrdup(p, urlptr);
1842 @@ -245,12 +254,18 @@
1843 err = ap_proxy_host2addr(proxyhost, &server_hp);
1845 return DECLINED; /* try another */
1847 + peer = ap_psprintf(p, "%s:%u", proxyhost, proxyport);
1851 server.sin_port = htons(destport);
1852 err = ap_proxy_host2addr(desthost, &server_hp);
1854 return ap_proxyerror(r, HTTP_INTERNAL_SERVER_ERROR, err);
1856 + peer = ap_psprintf(p, "%s:%u", desthost, destport);
1860 sock = ap_psocket(p, PF_INET, SOCK_STREAM, IPPROTO_TCP);
1861 @@ -307,13 +322,41 @@
1862 f = ap_bcreate(p, B_RDWR | B_SOCKET);
1863 ap_bpushfd(f, sock, sock);
1867 + char *errmsg = NULL;
1868 + ap_hook_use("ap::mod_proxy::http::handler::new_connection",
1869 + AP_HOOK_SIG4(ptr,ptr,ptr,ptr),
1870 + AP_HOOK_DECLINE(NULL),
1871 + &errmsg, r, f, peer);
1872 + if (errmsg != NULL)
1873 + return ap_proxyerror(r, HTTP_BAD_GATEWAY, errmsg);
1877 ap_hard_timeout("proxy send", r);
1878 ap_bvputs(f, r->method, " ", proxyhost ? url : urlptr, " HTTP/1.0" CRLF,
1882 + int rc = DECLINED;
1883 + ap_hook_use("ap::mod_proxy::http::handler::write_host_header",
1884 + AP_HOOK_SIG6(int,ptr,ptr,ptr,int,ptr),
1885 + AP_HOOK_DECLINE(DECLINED),
1886 + &rc, r, f, desthost, destport, destportstr);
1887 + if (rc == DECLINED) {
1888 + if (destportstr != NULL && destport != DEFAULT_HTTP_PORT)
1889 + ap_bvputs(f, "Host: ", desthost, ":", destportstr, CRLF, NULL);
1891 + ap_bvputs(f, "Host: ", desthost, CRLF, NULL);
1895 if (destportstr != NULL && destport != DEFAULT_HTTP_PORT)
1896 ap_bvputs(f, "Host: ", desthost, ":", destportstr, CRLF, NULL);
1898 ap_bvputs(f, "Host: ", desthost, CRLF, NULL);
1901 if (conf->viaopt == via_block) {
1902 /* Block all outgoing Via: headers */
1904 +---------------------------------------------------------------------------
1905 | Add EAPI hooks in module structure for APXS generated samples.
1906 +---------------------------------------------------------------------------
1907 Index: src/support/apxs.pl
1908 --- src/support/apxs.pl 2001/05/20 08:16:25 1.1.1.10
1909 +++ src/support/apxs.pl 2001/05/20 08:23:03 1.10
1910 @@ -703,5 +703,11 @@
1911 NULL, /* child_init */
1912 NULL, /* child_exit */
1913 NULL /* [#0] post read-request */
1915 + ,NULL, /* EAPI: add_module */
1916 + NULL, /* EAPI: remove_module */
1917 + NULL, /* EAPI: rewrite_command */
1918 + NULL /* EAPI: new_connection */
1923 +---------------------------------------------------------------------------
1924 | Add the EAPI functions, so the stuff can be built under AIX
1925 | and similar braindead platforms as DSO.
1926 +---------------------------------------------------------------------------
1927 Index: src/support/httpd.exp
1928 --- src/support/httpd.exp 2001/02/28 19:40:56 1.1.1.9
1929 +++ src/support/httpd.exp 2001/02/28 19:44:35 1.11
1930 @@ -422,3 +422,59 @@
1931 XML_SetUnparsedEntityDeclHandler
1933 XML_UseParserAsHandlerArg
1934 +ap_add_config_define
1935 +ap_make_shared_sub_pool
1944 +ap_hook_unregister_I
1979 +ap_mm_core_permission
1984 +ap_mm_core_maxsegsize
1985 +ap_mm_core_align2page
1986 +ap_mm_core_align2word
1987 +ap_mm_lib_error_set
1988 +ap_mm_lib_error_get
1991 +---------------------------------------------------------------------------
1992 | Add the EAPI functions, so the stuff can be built under
1993 | Windows 95 and similar braindead platforms as DDL.
1994 +---------------------------------------------------------------------------
1995 Index: src/ApacheCore.def
1996 --- src/ApacheCore.def 2001/01/23 11:35:01 1.1.1.7
1997 +++ src/ApacheCore.def 2001/03/03 10:46:41 1.11
1998 @@ -389,3 +389,69 @@
2001 ap_os_dso_error @382
2003 + ; EAPI extended symbols
2004 + ; note; no ID's, so these all bind by name rather than ordinal since
2005 + ; their ordinals would change with symbol changes in the distribution
2006 + ap_add_config_define
2007 + ap_global_ctx DATA
2015 + ap_hook_register_I
2016 + ap_hook_unregister_I
2020 + ap_set_callback_and_alarm
2024 + ap_make_shared_sub_pool
2055 + ap_mm_display_info
2057 + ap_mm_core_permission
2062 + ap_mm_core_align2page
2063 + ap_mm_core_align2word
2064 + ap_mm_lib_error_set
2065 + ap_mm_lib_error_get