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: 27-Mar-2002
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 28 Jan 2002 19:21:21 -0000 1.1.1.7
28 +++ src/Configuration.tmpl 28 Jan 2002 19:40:56 -0000 1.23
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 27 Mar 2002 15:22:54 -0000 1.1.1.18
60 +++ src/Configure 27 Mar 2002 15:30:02 -0000 1.21
61 @@ -1866,6 +1866,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 | sed -n -e '$p' | 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 20 May 2001 08:16:15 -0000 1.1.1.7
140 +++ src/ap/Makefile.tmpl 20 May 2001 08:23:01 -0000 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 \
147 + ap_strtol.o 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 16 Oct 2001 11:47:06 -0000 1.1.1.9
157 +++ src/ap/ap.mak 16 Oct 2001 11:57:38 -0000 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 27 Mar 2002 15:22:57 -0000 1.1.1.10
205 +++ src/include/ap_mmn.h 27 Mar 2002 15:30:02 -0000 1.10
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 27 Mar 2002 15:22:56 -0000 1.1.1.5
237 +++ src/include/ap_alloc.h 27 Mar 2002 15:30:02 -0000 1.6
239 API_EXPORT(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 27 Mar 2002 15:22:57 -0000 1.1.1.6
260 +++ src/include/buff.h 27 Mar 2002 15:30:02 -0000 1.10
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 27 Mar 2002 15:22:57 -0000 1.1.1.10
289 +++ src/include/http_config.h 27 Mar 2002 15:30:02 -0000 1.12
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 27 Mar 2002 15:22:57 -0000 1.1.1.11
363 +++ src/include/http_conf_globals.h 27 Mar 2002 15:30:02 -0000 1.12
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
383 +---------------------------------------------------------------------------
384 | First add support for the HTTPS protocol scheme via hooks,
385 | second add the additional context variable `ctx' for the
386 | conn_rec, server_rec and request_rec structures. And third
387 | add a prototype for the additional ap_add_config_define()
389 +---------------------------------------------------------------------------
390 Index: src/include/httpd.h
391 --- src/include/httpd.h 27 Mar 2002 15:22:59 -0000 1.1.1.18
392 +++ src/include/httpd.h 27 Mar 2002 15:30:02 -0000 1.28
394 /* Headers in which EVERYONE has an interest... */
396 #include "ap_config.h"
400 #include "ap_alloc.h"
402 + * Include the Extended API headers.
403 + * Don't move the position. It has to be after ap_alloc.h because it uses the
404 + * pool stuff but before buff.h because the buffer stuff uses the EAPI, too.
407 +#include "ap_hook.h"
413 @@ -141,12 +153,17 @@
414 #define DEFAULT_HTTP_PORT 80
415 #define DEFAULT_HTTPS_PORT 443
416 #define ap_is_default_port(port,r) ((port) == ap_default_port(r))
418 +#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")
419 +#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)
422 #define ap_http_method(r) ap_os_http_method(r)
424 #define ap_http_method(r) "http"
426 #define ap_default_port(r) DEFAULT_HTTP_PORT
429 /* --------- Default user name and group name running standalone ---------- */
430 /* --- These may be specified as numbers by placing a # before a number --- */
432 #define SCOREBOARD_MAINTENANCE_INTERVAL 1000000
437 + * Path to Shared Memory Files
440 +#ifndef EAPI_MM_CORE_PATH
441 +#define EAPI_MM_CORE_PATH "logs/mm"
443 +#ifndef EAPI_MM_CORE_MAXSIZE
444 +#define EAPI_MM_CORE_MAXSIZE 1024*1024*1 /* max. 1MB */
448 /* Number of requests to try to handle in a single process. If <= 0,
449 * the children don't die off. That's the default here, since I'm still
450 * interested in finding and stanching leaks.
452 API_EXPORT(const char *) ap_get_server_version(void);
453 API_EXPORT(void) ap_add_version_component(const char *component);
454 API_EXPORT(const char *) ap_get_server_built(void);
456 +API_EXPORT(void) ap_add_config_define(const char *define);
459 /* Numeric release version identifier: MMNNFFRBB: major minor fix final beta
460 * Always increases along the same track as the source branch.
462 * record to improve 64bit alignment the next time we need to break
463 * binary compatibility for some other reason.
473 char *local_host; /* used for ap_get_server_name when
474 * UseCanonicalName is set to DNS
475 * (ignores setting of HostnameLookups) */
481 /* Per-vhost config... */
482 @@ -975,6 +1015,10 @@
483 int limit_req_line; /* limit on size of the HTTP request line */
484 int limit_req_fieldsize; /* limit on size of any request header field */
485 int limit_req_fields; /* limit on number of request header fields */
492 /* These are more like real hosts than virtual hosts */
494 +---------------------------------------------------------------------------
495 | Patch the shared memory pool support into the Apache pool facility.
496 +---------------------------------------------------------------------------
497 Index: src/main/alloc.c
498 --- src/main/alloc.c 27 Mar 2002 15:23:00 -0000 1.1.1.12
499 +++ src/main/alloc.c 27 Mar 2002 15:30:02 -0000 1.19
505 +#include "http_config.h"
506 +#include "http_conf_globals.h"
508 #include "multithread.h"
509 #include "http_log.h"
512 #define BLOCK_MINALLOC 0
515 +#if defined(EAPI) && defined(EAPI_MM)
516 +static AP_MM *mm = NULL;
519 /*****************************************************************
521 * Managing free storage blocks...
524 union block_hdr *next;
526 +#if defined(EAPI) && defined(EAPI_MM)
530 union block_hdr *global_next;
531 struct pool *owning_pool;
533 /* Get a completely new block from the system pool. Note that we rely on
534 malloc() to provide aligned memory. */
536 +#if defined(EAPI) && defined(EAPI_MM)
537 +static union block_hdr *malloc_block(int size, int is_shm)
539 static union block_hdr *malloc_block(int size)
542 union block_hdr *blok;
544 @@ -230,12 +245,20 @@
546 num_malloc_bytes += size + sizeof(union block_hdr);
548 +#if defined(EAPI) && defined(EAPI_MM)
550 + blok = (union block_hdr *)ap_mm_malloc(mm, size + sizeof(union block_hdr));
553 blok = (union block_hdr *) malloc(size + sizeof(union block_hdr));
555 fprintf(stderr, "Ouch! malloc failed in malloc_block()\n");
558 debug_fill(blok, size + sizeof(union block_hdr));
559 +#if defined(EAPI) && defined(EAPI_MM)
560 + blok->h.is_shm = is_shm;
563 blok->h.first_avail = (char *) (blok + 1);
564 blok->h.endp = size + blok->h.first_avail;
567 return; /* Sanity check --- freeing empty pool? */
569 +#if defined(EAPI) && defined(EAPI_MM)
570 + if (blok->h.is_shm)
571 + (void)ap_mm_lock(mm, AP_MM_LOCK_RW);
573 (void) ap_acquire_mutex(alloc_mutex);
574 old_free_list = block_freelist;
575 block_freelist = blok;
579 (void) ap_release_mutex(alloc_mutex);
580 +#if defined(EAPI) && defined(EAPI_MM)
581 + if (blok->h.is_shm)
582 + (void)ap_mm_unlock(mm);
588 * if necessary. Must be called with alarms blocked.
591 +#if defined(EAPI) && defined(EAPI_MM)
592 +static union block_hdr *new_block(int min_size, int is_shm)
594 static union block_hdr *new_block(int min_size)
597 union block_hdr **lastptr = &block_freelist;
598 union block_hdr *blok = block_freelist;
602 while (blok != NULL) {
603 +#if defined(EAPI) && defined(EAPI_MM)
604 + if (blok->h.is_shm == is_shm &&
605 + min_size + BLOCK_MINFREE <= blok->h.endp - blok->h.first_avail) {
607 if (min_size + BLOCK_MINFREE <= blok->h.endp - blok->h.first_avail) {
609 *lastptr = blok->h.next;
611 debug_verify_filled(blok->h.first_avail, blok->h.endp,
615 min_size += BLOCK_MINFREE;
616 +#if defined(EAPI) && defined(EAPI_MM)
617 + blok = malloc_block((min_size > BLOCK_MINALLOC) ? min_size : BLOCK_MINALLOC, is_shm);
619 blok = malloc_block((min_size > BLOCK_MINALLOC) ? min_size : BLOCK_MINALLOC);
628 +#if defined(EAPI) && defined(EAPI_MM)
633 static pool *permanent_pool;
634 @@ -440,16 +487,28 @@
635 #define POOL_HDR_CLICKS (1 + ((sizeof(struct pool) - 1) / CLICK_SZ))
636 #define POOL_HDR_BYTES (POOL_HDR_CLICKS * CLICK_SZ)
638 +#if defined(EAPI) && defined(EAPI_MM)
639 +static struct pool *make_sub_pool_internal(struct pool *p, int is_shm)
641 API_EXPORT(struct pool *) ap_make_sub_pool(struct pool *p)
644 union block_hdr *blok;
649 +#if defined(EAPI) && defined(EAPI_MM)
651 + (void)ap_mm_lock(mm, AP_MM_LOCK_RW);
653 (void) ap_acquire_mutex(alloc_mutex);
655 +#if defined(EAPI) && defined(EAPI_MM)
656 + blok = new_block(POOL_HDR_BYTES, is_shm);
658 blok = new_block(POOL_HDR_BYTES);
660 new_pool = (pool *) blok->h.first_avail;
661 blok->h.first_avail += POOL_HDR_BYTES;
663 @@ -468,12 +527,38 @@
664 p->sub_pools = new_pool;
667 +#if defined(EAPI) && defined(EAPI_MM)
668 + new_pool->is_shm = is_shm;
671 (void) ap_release_mutex(alloc_mutex);
672 +#if defined(EAPI) && defined(EAPI_MM)
674 + (void)ap_mm_unlock(mm);
682 +#if defined(EAPI_MM)
683 +API_EXPORT(struct pool *) ap_make_sub_pool(struct pool *p)
685 + return make_sub_pool_internal(p, 0);
687 +API_EXPORT(struct pool *) ap_make_shared_sub_pool(struct pool *p)
689 + return make_sub_pool_internal(p, 1);
692 +API_EXPORT(struct pool *) ap_make_shared_sub_pool(struct pool *p)
700 static void stack_var_init(char *s)
707 +int ap_shared_pool_possible(void)
709 + return ap_mm_useable();
714 static void dump_stats(void)
717 return permanent_pool;
721 +void ap_init_alloc_shared(int early)
723 +#if defined(EAPI_MM)
729 + /* process very early on startup */
730 + mm_size = ap_mm_maxsize();
731 + if (mm_size > EAPI_MM_CORE_MAXSIZE)
732 + mm_size = EAPI_MM_CORE_MAXSIZE;
733 + mm_path = ap_server_root_relative(permanent_pool,
734 + ap_psprintf(permanent_pool, "%s.%ld",
735 + EAPI_MM_CORE_PATH, (long)getpid()));
736 + if ((mm = ap_mm_create(mm_size, mm_path)) == NULL) {
737 + fprintf(stderr, "Ouch! ap_mm_create(%d, \"%s\") failed\n", mm_size, mm_path);
738 + err1 = ap_mm_error();
740 + err1 = "-unknown-";
741 + err2 = strerror(errno);
743 + err2 = "-unknown-";
744 + fprintf(stderr, "Error: MM: %s: OS: %s\n", err1, err2);
749 + /* process a lot later on startup */
751 + ap_mm_permission(mm, (_S_IREAD|_S_IWRITE), ap_user_id, -1);
753 + ap_mm_permission(mm, (S_IRUSR|S_IWUSR), ap_user_id, -1);
756 +#endif /* EAPI_MM */
760 +void ap_kill_alloc_shared(void)
762 +#if defined(EAPI_MM)
767 +#endif /* EAPI_MM */
772 void ap_cleanup_alloc(void)
774 ap_destroy_mutex(alloc_mutex);
775 @@ -530,10 +674,18 @@
779 +#if defined(EAPI) && defined(EAPI_MM)
781 + (void)ap_mm_lock(mm, AP_MM_LOCK_RW);
783 (void) ap_acquire_mutex(alloc_mutex);
785 ap_destroy_pool(a->sub_pools);
786 (void) ap_release_mutex(alloc_mutex);
787 +#if defined(EAPI) && defined(EAPI_MM)
789 + (void)ap_mm_unlock(mm);
791 /* Don't hold the mutex during cleanups. */
792 run_cleanups(a->cleanups);
798 +#if defined(EAPI) && defined(EAPI_MM)
800 + (void)ap_mm_lock(mm, AP_MM_LOCK_RW);
802 (void) ap_acquire_mutex(alloc_mutex);
804 if (a->parent->sub_pools == a)
806 a->sub_next->sub_prev = a->sub_prev;
808 (void) ap_release_mutex(alloc_mutex);
809 +#if defined(EAPI) && defined(EAPI_MM)
811 + (void)ap_mm_unlock(mm);
814 free_blocks(a->first);
817 return bytes_in_block_list(block_freelist);
821 +API_EXPORT(int) ap_acquire_pool(pool *p, ap_pool_lock_mode mode)
823 +#if defined(EAPI_MM)
826 + return ap_mm_lock(mm, mode == AP_POOL_RD ? AP_MM_LOCK_RD : AP_MM_LOCK_RW);
832 +API_EXPORT(int) ap_release_pool(pool *p)
834 +#if defined(EAPI_MM)
837 + return ap_mm_unlock(mm);
844 /*****************************************************************
847 @@ -756,16 +940,31 @@
851 +#if defined(EAPI) && defined(EAPI_MM)
853 + (void)ap_mm_lock(mm, AP_MM_LOCK_RW);
855 (void) ap_acquire_mutex(alloc_mutex);
857 +#if defined(EAPI) && defined(EAPI_MM)
858 + blok = new_block(size, a->is_shm);
860 blok = new_block(size);
862 a->last->h.next = blok;
865 blok->h.owning_pool = a;
867 +#if defined(EAPI) && defined(EAPI_MM)
868 + blok->h.is_shm = a->is_shm;
871 (void) ap_release_mutex(alloc_mutex);
872 +#if defined(EAPI) && defined(EAPI_MM)
874 + (void)ap_mm_unlock(mm);
879 @@ -877,6 +1076,11 @@
882 size = (char *)ps->vbuff.curpos - ps->base;
883 +#if defined(EAPI) && defined(EAPI_MM)
884 + if (ps->block->h.is_shm)
885 + ptr = ap_mm_realloc(ps->base, 2*size);
888 ptr = realloc(ps->base, 2*size);
890 fputs("Ouch! Out of memory!\n", stderr);
891 @@ -897,9 +1101,21 @@
892 cur_len = strp - blok->h.first_avail;
894 /* must try another blok */
895 +#if defined(EAPI) && defined(EAPI_MM)
896 + if (blok->h.is_shm)
897 + (void)ap_mm_lock(mm, AP_MM_LOCK_RW);
899 (void) ap_acquire_mutex(alloc_mutex);
900 +#if defined(EAPI) && defined(EAPI_MM)
901 + nblok = new_block(2 * cur_len, blok->h.is_shm);
903 nblok = new_block(2 * cur_len);
905 (void) ap_release_mutex(alloc_mutex);
906 +#if defined(EAPI) && defined(EAPI_MM)
907 + if (blok->h.is_shm)
908 + (void)ap_mm_unlock(mm);
910 memcpy(nblok->h.first_avail, blok->h.first_avail, cur_len);
911 ps->vbuff.curpos = nblok->h.first_avail + cur_len;
912 /* save a byte for the NUL terminator */
913 @@ -908,10 +1124,18 @@
914 /* did we allocate the current blok? if so free it up */
915 if (ps->got_a_new_block) {
916 debug_fill(blok->h.first_avail, blok->h.endp - blok->h.first_avail);
917 +#if defined(EAPI) && defined(EAPI_MM)
918 + if (blok->h.is_shm)
919 + (void)ap_mm_lock(mm, AP_MM_LOCK_RW);
921 (void) ap_acquire_mutex(alloc_mutex);
922 blok->h.next = block_freelist;
923 block_freelist = blok;
924 (void) ap_release_mutex(alloc_mutex);
925 +#if defined(EAPI) && defined(EAPI_MM)
926 + if (blok->h.is_shm)
927 + (void)ap_mm_unlock(mm);
931 ps->got_a_new_block = 1;
932 @@ -930,6 +1154,11 @@
936 +#if defined(EAPI) && defined(EAPI_MM)
938 + ps.base = ap_mm_malloc(mm, 512);
941 ps.base = malloc(512);
942 if (ps.base == NULL) {
943 fputs("Ouch! Out of memory!\n", stderr);
944 @@ -942,6 +1171,11 @@
945 *ps.vbuff.curpos++ = '\0';
948 +#if defined(EAPI) && defined(EAPI_MM)
950 + ptr = ap_mm_realloc(ptr, (char *)ps.vbuff.curpos - (char *)ptr);
953 ptr = realloc(ptr, (char *)ps.vbuff.curpos - (char *)ptr);
955 fputs("Ouch! Out of memory!\n", stderr);
957 +---------------------------------------------------------------------------
958 | Patch the low-level buffer routines to additionally allow
959 | modules to intercept the I/O processing via hooks.
960 +---------------------------------------------------------------------------
961 Index: src/main/buff.c
962 --- src/main/buff.c 27 Mar 2002 15:23:00 -0000 1.1.1.12
963 +++ src/main/buff.c 27 Mar 2002 15:30:02 -0000 1.20
969 + if (!ap_hook_call("ap::buff::read", &rv, fb, buf, nbyte))
971 rv = read(fb->fd_in, buf, nbyte);
976 #if defined (WIN32) || defined(NETWARE) || defined(CYGWIN_WINSOCK)
977 if (fb->flags & B_SOCKET) {
979 + if (!ap_hook_call("ap::buff::recvwithtimeout", &rv, fb, buf, nbyte))
981 rv = ap_recvwithtimeout(fb->fd_in, buf, nbyte, 0);
982 if (rv == SOCKET_ERROR)
983 errno = WSAGetLastError();
989 + if (!ap_hook_call("ap::buff::write", &rv, fb, buf, nbyte))
992 rv = sfwrite(fb->sf_out, buf, nbyte);
996 #if defined(WIN32) || defined(NETWARE)
997 if (fb->flags & B_SOCKET) {
999 + if (!ap_hook_call("ap::buff::sendwithtimeout", &rv, fb, buf, nbyte))
1001 rv = ap_sendwithtimeout(fb->fd, buf, nbyte, 0);
1002 if (rv == SOCKET_ERROR)
1003 errno = WSAGetLastError();
1004 @@ -464,6 +476,10 @@
1005 fb->callback_data = NULL;
1006 fb->filter_callback = NULL;
1009 + fb->ctx = ap_ctx_new(p);
1015 @@ -1116,6 +1132,9 @@
1020 + if (!ap_hook_call("ap::buff::writev", &rv, fb, &vec[i], nvec -i))
1022 rv = writev(fb->fd, &vec[i], nvec - i);
1023 while (rv == -1 && (errno == EINTR || errno == EAGAIN)
1024 && !(fb->flags & B_EOUT));
1026 +---------------------------------------------------------------------------
1027 | Add the implementation of the additional `add_module' and
1028 | `rewrite_command' module hooks. Additionally the `ctx'
1029 | variables are initialized.
1030 +---------------------------------------------------------------------------
1031 Index: src/main/http_config.c
1032 --- src/main/http_config.c 27 Mar 2002 15:23:00 -0000 1.1.1.14
1033 +++ src/main/http_config.c 27 Mar 2002 15:30:02 -0000 1.17
1034 @@ -599,6 +599,20 @@
1037 #endif /*_OSD_POSIX*/
1041 + * Invoke the `add_module' hook inside the now existing set
1042 + * of modules to let them all now that this module was added.
1046 + for (m2 = top_module; m2 != NULL; m2 = m2->next)
1047 + if (m2->magic == MODULE_MAGIC_COOKIE_EAPI)
1048 + if (m2->add_module != NULL)
1049 + (*m2->add_module)(m);
1055 @@ -613,6 +627,21 @@
1061 + * Invoke the `remove_module' hook inside the now existing
1062 + * set of modules to let them all now that this module is
1067 + for (m2 = top_module; m2 != NULL; m2 = m2->next)
1068 + if (m2->magic == MODULE_MAGIC_COOKIE_EAPI)
1069 + if (m2->remove_module != NULL)
1070 + (*m2->remove_module)(m);
1076 /* We are the top module, special case */
1077 @@ -1006,6 +1035,27 @@
1078 const command_rec *cmd;
1079 module *mod = top_module;
1083 + * Invoke the `rewrite_command' of modules to allow
1084 + * they to rewrite the directive line before we
1090 + for (m = top_module; m != NULL; m = m->next) {
1091 + if (m->magic == MODULE_MAGIC_COOKIE_EAPI) {
1092 + if (m->rewrite_command != NULL) {
1093 + cp = (m->rewrite_command)(parms, config, l);
1102 if ((l[0] == '#') || (!l[0]))
1105 @@ -1440,6 +1490,10 @@
1106 s->limit_req_fieldsize = main_server->limit_req_fieldsize;
1107 s->limit_req_fields = main_server->limit_req_fields;
1110 + s->ctx = ap_ctx_new(p);
1115 return ap_parse_vhost_addrs(p, hostname, s);
1116 @@ -1550,6 +1604,10 @@
1118 s->module_config = create_server_config(p, s);
1119 s->lookup_defaults = create_default_per_dir_config(p);
1122 + s->ctx = ap_ctx_new(p);
1128 +---------------------------------------------------------------------------
1129 | Add the ap_global_ctx variable and the new
1130 | ap_add_config_define() function. Additionally the
1131 | implementation of the additional `new_connection' module hook
1132 | is added plus the initialization of one more `ctx' variable.
1133 +---------------------------------------------------------------------------
1134 Index: src/main/http_main.c
1135 --- src/main/http_main.c 27 Mar 2002 15:23:01 -0000 1.1.1.17
1136 +++ src/main/http_main.c 27 Mar 2002 15:30:02 -0000 1.39
1139 int ap_dump_settings = 0;
1140 API_VAR_EXPORT int ap_extended_status = 0;
1142 +API_VAR_EXPORT ap_ctx *ap_global_ctx;
1146 * The max child slot ever assigned, preserved across restarts. Necessary
1147 @@ -461,6 +464,30 @@
1152 +API_EXPORT(void) ap_add_config_define(const char *define)
1155 + var = (char **)ap_push_array(ap_server_config_defines);
1156 + *var = ap_pstrdup(pcommands, define);
1161 + * Invoke the `close_connection' hook of modules to let them do
1162 + * some connection dependent actions before we close it.
1164 +static void ap_call_close_connection_hook(conn_rec *c)
1167 + for (m = top_module; m != NULL; m = m->next)
1168 + if (m->magic == MODULE_MAGIC_COOKIE_EAPI)
1169 + if (m->close_connection != NULL)
1170 + (*m->close_connection)(c);
1176 static APACHE_TLS int volatile exit_after_unblock = 0;
1178 @@ -1513,6 +1540,10 @@
1179 ap_log_transaction(log_req);
1183 + ap_call_close_connection_hook(save_req->connection);
1186 ap_bsetflag(save_req->connection->client, B_EOUT, 1);
1187 ap_bclose(save_req->connection->client);
1189 @@ -1521,6 +1552,9 @@
1190 ap_longjmp(jmpbuffer, 1);
1192 else { /* abort the connection */
1194 + ap_call_close_connection_hook(current_conn);
1196 ap_bsetflag(current_conn->client, B_EOUT, 1);
1197 ap_bclose(current_conn->client);
1198 current_conn->aborted = 1;
1199 @@ -1823,10 +1857,16 @@
1200 /* Send any leftover data to the client, but never try to again */
1202 if (ap_bflush(r->connection->client) == -1) {
1204 + ap_call_close_connection_hook(r->connection);
1207 ap_bclose(r->connection->client);
1211 + ap_call_close_connection_hook(r->connection);
1213 ap_bsetflag(r->connection->client, B_EOUT, 1);
1215 /* Close our half of the connection --- send the client a FIN */
1216 @@ -2554,6 +2594,9 @@
1217 /* Clear the pool - including any registered cleanups */
1218 ap_destroy_pool(pglobal);
1221 + ap_kill_alloc_shared();
1226 @@ -3549,6 +3592,24 @@
1227 conn->remote_addr = *remaddr;
1228 conn->remote_ip = ap_pstrdup(conn->pool,
1229 inet_ntoa(conn->remote_addr.sin_addr));
1231 + conn->ctx = ap_ctx_new(conn->pool);
1236 + * Invoke the `new_connection' hook of modules to let them do
1237 + * some connection dependent actions before we go on with
1238 + * processing the request on this connection.
1242 + for (m = top_module; m != NULL; m = m->next)
1243 + if (m->magic == MODULE_MAGIC_COOKIE_EAPI)
1244 + if (m->new_connection != NULL)
1245 + (*m->new_connection)(conn);
1251 @@ -3977,6 +4038,15 @@
1252 printf("Server's Module Magic Number: %u:%u\n",
1253 MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
1254 printf("Server compiled with....\n");
1256 + printf(" -D EAPI\n");
1259 + printf(" -D EAPI_MM\n");
1260 +#ifdef EAPI_MM_CORE_PATH
1261 + printf(" -D EAPI_MM_CORE_PATH=\"" EAPI_MM_CORE_PATH "\"\n");
1265 show_os_specific_compile_settings();
1267 @@ -4149,6 +4219,22 @@
1268 ap_server_pre_read_config = ap_make_array(pcommands, 1, sizeof(char *));
1269 ap_server_post_read_config = ap_make_array(pcommands, 1, sizeof(char *));
1270 ap_server_config_defines = ap_make_array(pcommands, 1, sizeof(char *));
1274 + ap_hook_configure("ap::buff::read",
1275 + AP_HOOK_SIG4(int,ptr,ptr,int), AP_HOOK_TOPMOST);
1276 + ap_hook_configure("ap::buff::write",
1277 + AP_HOOK_SIG4(int,ptr,ptr,int), AP_HOOK_TOPMOST);
1278 + ap_hook_configure("ap::buff::writev",
1279 + AP_HOOK_SIG4(int,ptr,ptr,int), AP_HOOK_TOPMOST);
1280 + ap_hook_configure("ap::buff::sendwithtimeout",
1281 + AP_HOOK_SIG4(int,ptr,ptr,int), AP_HOOK_TOPMOST);
1282 + ap_hook_configure("ap::buff::recvwithtimeout",
1283 + AP_HOOK_SIG4(int,ptr,ptr,int), AP_HOOK_TOPMOST);
1285 + ap_global_ctx = ap_ctx_new(NULL);
1290 @@ -4592,6 +4678,9 @@
1292 ap_sync_scoreboard_image();
1293 if (ap_scoreboard_image->global.running_generation != ap_my_generation) {
1295 + ap_call_close_connection_hook(current_conn);
1298 clean_child_exit(0);
1300 @@ -4620,6 +4709,9 @@
1305 + ap_call_close_connection_hook(current_conn);
1307 ap_bclose(conn_io); /* just close it */
1309 if (r && r->connection
1310 @@ -4630,6 +4722,9 @@
1315 + ap_call_close_connection_hook(current_conn);
1317 ap_bsetflag(conn_io, B_EOUT, 1);
1320 @@ -5389,16 +5484,31 @@
1325 + ap_init_alloc_shared(TRUE);
1328 ap_suexec_enabled = init_suexec();
1329 server_conf = ap_read_config(pconf, ptrans, ap_server_confname);
1332 + ap_init_alloc_shared(FALSE);
1335 if (ap_configtestonly) {
1336 fprintf(stderr, "Syntax OK\n");
1338 + clean_parent_exit(0);
1343 if (ap_dump_settings) {
1345 + clean_parent_exit(0);
1351 child_timeouts = !ap_standalone || one_process;
1352 @@ -5529,6 +5639,10 @@
1353 ap_destroy_pool(r->pool);
1357 + ap_call_close_connection_hook(conn);
1363 @@ -5905,6 +6019,9 @@
1364 ap_kill_cleanups_for_socket(ptrans, csd);
1368 + ap_call_close_connection_hook(current_conn);
1370 ap_bclose(conn_io); /* just close it */
1372 if (r && r->connection
1373 @@ -5915,6 +6032,9 @@
1378 + ap_call_close_connection_hook(current_conn);
1380 ap_bsetflag(conn_io, B_EOUT, 1);
1383 @@ -7478,6 +7598,10 @@
1384 if (!conf_specified)
1385 ap_cpystrn(ap_server_confname, SERVER_CONFIG_FILE, sizeof(ap_server_confname));
1388 + ap_init_alloc_shared(TRUE);
1391 if (!ap_os_is_path_absolute(ap_server_confname))
1392 ap_cpystrn(ap_server_confname,
1393 ap_server_root_relative(pcommands, ap_server_confname),
1394 @@ -7517,6 +7641,9 @@
1396 #else /* ndef WIN32 */
1397 server_conf = ap_read_config(pconf, ptrans, ap_server_confname);
1400 + ap_init_alloc_shared(FALSE);
1403 if (ap_configtestonly) {
1405 +---------------------------------------------------------------------------
1406 | Just add the initialization of the `ctx' variable for
1407 | conn_rec structures.
1408 +---------------------------------------------------------------------------
1409 Index: src/main/http_request.c
1410 --- src/main/http_request.c 27 Mar 2002 15:23:02 -0000 1.1.1.14
1411 +++ src/main/http_request.c 27 Mar 2002 15:30:02 -0000 1.14
1412 @@ -1375,6 +1375,10 @@
1414 new->method = r->method;
1415 new->method_number = r->method_number;
1417 + /* initialize context _BEFORE_ ap_parse_uri() call */
1418 + new->ctx = r->ctx;
1420 ap_parse_uri(new, new_uri);
1421 new->request_config = ap_create_request_config(r->pool);
1422 new->per_dir_config = r->server->lookup_defaults;
1424 +---------------------------------------------------------------------------
1425 | Just add the initialization of the `ctx' variable for
1426 | request_rec structures.
1427 +---------------------------------------------------------------------------
1428 Index: src/main/http_protocol.c
1429 --- src/main/http_protocol.c 27 Mar 2002 15:23:02 -0000 1.1.1.16
1430 +++ src/main/http_protocol.c 27 Mar 2002 15:30:02 -0000 1.16
1431 @@ -1151,6 +1151,10 @@
1432 r->status = HTTP_REQUEST_TIME_OUT; /* Until we get a request */
1433 r->the_request = NULL;
1436 + r->ctx = ap_ctx_new(r->pool);
1439 #ifdef CHARSET_EBCDIC
1440 ap_bsetflag(r->connection->client, B_ASCII2EBCDIC, r->ebcdic.conv_in = 1);
1441 ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, r->ebcdic.conv_out = 1);
1442 @@ -1299,6 +1303,11 @@
1443 rnew->read_body = REQUEST_NO_BODY;
1445 rnew->main = (request_rec *) r;
1448 + rnew->ctx = r->ctx;
1453 API_EXPORT(void) ap_finalize_sub_req_protocol(request_rec *sub)
1455 +---------------------------------------------------------------------------
1456 | Add support for loading both EAPI and AP13 modules.
1457 +---------------------------------------------------------------------------
1458 Index: src/modules/standard/mod_so.c
1459 --- src/modules/standard/mod_so.c 27 Mar 2002 15:23:06 -0000 1.1.1.9
1460 +++ src/modules/standard/mod_so.c 27 Mar 2002 15:30:03 -0000 1.10
1461 @@ -269,11 +269,24 @@
1462 * Make sure the found module structure is really a module structure
1466 + if ( modp->magic != MODULE_MAGIC_COOKIE_AP13
1467 + && modp->magic != MODULE_MAGIC_COOKIE_EAPI) {
1469 if (modp->magic != MODULE_MAGIC_COOKIE) {
1471 return ap_pstrcat(cmd->pool, "API module structure `", modname,
1472 "' in file ", szModuleFile, " is garbled -"
1473 " perhaps this is not an Apache module DSO?", NULL);
1476 + if (modp->magic == MODULE_MAGIC_COOKIE_AP13) {
1477 + ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, NULL,
1478 + "Loaded DSO %s uses plain Apache 1.3 API, "
1479 + "this module might crash under EAPI! "
1480 + "(please recompile it with -DEAPI)", filename);
1485 * Add this module to the Apache core structures
1487 +---------------------------------------------------------------------------
1488 | Add additional logging functions to the CustomLog directive
1489 | which can be used by other modules to create additional
1490 | logfile tags. Actually we add two types of hooks: One hook
1491 | for intercepting the new and generic %x (eXtension) tag and
1492 | one hook for creating new %x tags at all.
1493 +---------------------------------------------------------------------------
1494 Index: src/modules/standard/mod_log_config.c
1495 --- src/modules/standard/mod_log_config.c 27 Mar 2002 15:23:05 -0000 1.1.1.12
1496 +++ src/modules/standard/mod_log_config.c 27 Mar 2002 15:30:03 -0000 1.25
1498 typedef const char *(*item_key_func) (request_rec *, char *);
1506 int condition_sense;
1507 @@ -573,15 +576,36 @@
1512 +static struct log_item_list *find_log_func(pool *p, char k)
1514 static struct log_item_list *find_log_func(char k)
1519 + struct log_item_list *lil;
1522 for (i = 0; log_item_keys[i].ch; ++i)
1523 if (k == log_item_keys[i].ch) {
1524 return &log_item_keys[i];
1528 + if (ap_hook_status(ap_psprintf(p, "ap::mod_log_config::log_%c", k))
1529 + != AP_HOOK_STATE_NOTEXISTANT) {
1530 + lil = (struct log_item_list *)
1531 + ap_pcalloc(p, sizeof(struct log_item_list));
1536 + lil->want_orig_default = 0;
1544 @@ -707,7 +731,11 @@
1549 + l = find_log_func(p, *s++);
1551 l = find_log_func(*s++);
1557 return ap_pstrcat(p, "Unrecognized LogFormat directive %",
1564 if (it->want_orig == -1) {
1565 it->want_orig = l->want_orig_default;
1566 @@ -777,6 +808,15 @@
1568 /* We do. Do it... */
1571 + if (item->func == NULL) {
1573 + ap_hook_use(ap_psprintf(r->pool, "ap::mod_log_config::log_%c", item->ch),
1574 + AP_HOOK_SIG3(ptr,ptr,ptr), AP_HOOK_DECLINE(NULL),
1575 + &cp, r, item->arg);
1579 cp = (*item->func) (item->want_orig ? orig : r, item->arg);
1580 return cp ? cp : "-";
1583 +---------------------------------------------------------------------------
1584 | Allow RewriteCond and RewriteRule directives to lookup
1585 | variables from other modules.
1586 +---------------------------------------------------------------------------
1587 Index: src/modules/standard/mod_rewrite.c
1588 --- src/modules/standard/mod_rewrite.c 27 Mar 2002 15:23:06 -0000 1.1.1.14
1589 +++ src/modules/standard/mod_rewrite.c 27 Mar 2002 15:30:03 -0000 1.12
1590 @@ -3678,6 +3678,15 @@
1592 #endif /* ndef WIN32 && NETWARE*/
1596 + ap_hook_use("ap::mod_rewrite::lookup_variable",
1597 + AP_HOOK_SIG3(ptr,ptr,ptr),
1598 + AP_HOOK_DECLINE(NULL),
1603 if (result == NULL) {
1604 return ap_pstrdup(r->pool, "");
1607 +---------------------------------------------------------------------------
1608 | Add an EAPI hook to allow other modules to add content to
1609 | the status HTML page.
1610 +---------------------------------------------------------------------------
1611 Index: src/modules/standard/mod_status.c
1612 --- src/modules/standard/mod_status.c 27 Mar 2002 15:23:06 -0000 1.1.1.14
1613 +++ src/modules/standard/mod_status.c 27 Mar 2002 15:30:03 -0000 1.11
1614 @@ -717,6 +754,12 @@
1620 + ap_hook_use("ap::mod_status::display",
1621 + AP_HOOK_SIG4(void,ptr,int,int), AP_HOOK_ALL,
1622 + r, no_table_report, short_report);
1628 +---------------------------------------------------------------------------
1629 | Add hooks to the scheme processing to allow other modules to
1630 | recognize more schemes by intercepting this processing.
1631 +---------------------------------------------------------------------------
1632 Index: src/modules/proxy/mod_proxy.c
1633 --- src/modules/proxy/mod_proxy.c 27 Mar 2002 15:23:03 -0000 1.1.1.11
1634 +++ src/modules/proxy/mod_proxy.c 27 Mar 2002 15:30:03 -0000 1.18
1636 static int proxy_fixup(request_rec *r)
1643 if (r->proxyreq == NOT_PROXY || strncmp(r->filename, "proxy:", 6) != 0)
1645 @@ -222,6 +225,14 @@
1646 url = &r->filename[6];
1648 /* canonicalise each specific scheme */
1650 + if (ap_hook_use("ap::mod_proxy::canon",
1651 + AP_HOOK_SIG3(int,ptr,ptr),
1652 + AP_HOOK_DECLINE(DECLINED),
1653 + &rc, r, url) && rc != DECLINED)
1657 if (strncasecmp(url, "http:", 5) == 0)
1658 return ap_proxy_http_canon(r, url + 5, "http", DEFAULT_HTTP_PORT);
1659 else if (strncasecmp(url, "ftp:", 4) == 0)
1660 @@ -237,9 +248,44 @@
1661 static void proxy_init(server_rec *r, pool *p)
1663 ap_proxy_garbage_init(r, p);
1665 + ap_hook_use("ap::mod_proxy::init",
1666 + AP_HOOK_SIG3(void,ptr,ptr), AP_HOOK_ALL, r, p);
1672 +static void proxy_addmod(module *m)
1674 + /* export: ap_proxy_http_canon() as `ap::mod_proxy::http::canon' */
1675 + ap_hook_configure("ap::mod_proxy::http::canon",
1676 + AP_HOOK_SIG5(int,ptr,ptr,ptr,int), AP_HOOK_TOPMOST);
1677 + ap_hook_register("ap::mod_proxy::http::canon",
1678 + ap_proxy_http_canon, AP_HOOK_NOCTX);
1680 + /* export: ap_proxy_http_handler() as `ap::mod_proxy::http::handler' */
1681 + ap_hook_configure("ap::mod_proxy::http::handler",
1682 + AP_HOOK_SIG6(int,ptr,ptr,ptr,ptr,int), AP_HOOK_TOPMOST);
1683 + ap_hook_register("ap::mod_proxy::http::handler",
1684 + ap_proxy_http_handler, AP_HOOK_NOCTX);
1686 + /* export: ap_proxyerror() as `ap::mod_proxy::error' */
1687 + ap_hook_configure("ap::mod_proxy::error",
1688 + AP_HOOK_SIG3(int,ptr,ptr), AP_HOOK_TOPMOST);
1689 + ap_hook_register("ap::mod_proxy::error",
1690 + ap_proxyerror, AP_HOOK_NOCTX);
1694 +static void proxy_remmod(module *m)
1696 + /* remove the hook references */
1697 + ap_hook_unregister("ap::mod_proxy::http::canon", ap_proxy_http_canon);
1698 + ap_hook_unregister("ap::mod_proxy::http::handler", ap_proxy_http_handler);
1699 + ap_hook_unregister("ap::mod_proxy::error", ap_proxyerror);
1704 /* Send a redirection if the request contains a hostname which is not */
1705 /* fully qualified, i.e. doesn't have a domain name appended. Some proxy */
1706 @@ -370,6 +416,14 @@
1707 /* CONNECT is a special method that bypasses the normal
1711 + if (!ap_hook_use("ap::mod_proxy::handler",
1712 + AP_HOOK_SIG7(int,ptr,ptr,ptr,ptr,int,ptr),
1713 + AP_HOOK_DECLINE(DECLINED),
1715 + ents[i].hostname, ents[i].port,
1716 + ents[i].protocol) || rc == DECLINED) {
1718 if (r->method_number == M_CONNECT)
1719 rc = ap_proxy_connect_handler(r, cr, url, ents[i].hostname,
1729 /* an error or success */
1730 if (rc != DECLINED && rc != HTTP_BAD_GATEWAY)
1731 @@ -392,6 +449,14 @@
1734 /* handle the scheme */
1736 + if (ap_hook_use("ap::mod_proxy::handler",
1737 + AP_HOOK_SIG7(int,ptr,ptr,ptr,ptr,int,ptr),
1738 + AP_HOOK_DECLINE(DECLINED),
1740 + NULL, 0, scheme) && rc != DECLINED)
1743 if (r->method_number == M_CONNECT) {
1744 return ap_proxy_connect_handler(r, cr, url, NULL, 0);
1746 @@ -973,6 +1038,12 @@
1747 NULL, /* child_init */
1748 NULL, /* child_exit */
1749 proxy_detect /* post read-request */
1751 + ,proxy_addmod, /* EAPI: add_module */
1752 + proxy_remmod, /* EAPI: remove_module */
1753 + NULL, /* EAPI: rewrite_command */
1754 + NULL /* EAPI: new_connection */
1760 +---------------------------------------------------------------------------
1761 | Add hooks to the HTTP processing to allow other modules
1762 | to enhance it by intercepting this processing.
1763 +---------------------------------------------------------------------------
1764 Index: src/modules/proxy/proxy_http.c
1765 --- src/modules/proxy/proxy_http.c 27 Mar 2002 15:23:04 -0000 1.1.1.13
1766 +++ src/modules/proxy/proxy_http.c 27 Mar 2002 15:30:03 -0000 1.21
1768 const char *urlptr = NULL;
1769 const char *datestr, *urlstr;
1770 const char *content_length;
1775 void *sconf = r->server->module_config;
1776 proxy_server_conf *conf =
1777 @@ -186,6 +189,12 @@
1778 return HTTP_BAD_REQUEST;
1780 destport = DEFAULT_HTTP_PORT;
1782 + ap_hook_use("ap::mod_proxy::http::handler::set_destport",
1783 + AP_HOOK_SIG2(int,ptr),
1787 strp = strchr(urlptr, '/');
1789 desthost = ap_pstrdup(p, urlptr);
1790 @@ -223,12 +232,18 @@
1791 err = ap_proxy_host2addr(proxyhost, &server_hp);
1793 return DECLINED; /* try another */
1795 + peer = ap_psprintf(p, "%s:%u", proxyhost, proxyport);
1799 server.sin_port = htons((unsigned short)destport);
1800 err = ap_proxy_host2addr(desthost, &server_hp);
1802 return ap_proxyerror(r, HTTP_INTERNAL_SERVER_ERROR, err);
1804 + peer = ap_psprintf(p, "%s:%u", desthost, destport);
1809 @@ -301,14 +316,42 @@
1810 f = ap_bcreate(p, B_RDWR | B_SOCKET);
1811 ap_bpushfd(f, sock, sock);
1815 + char *errmsg = NULL;
1816 + ap_hook_use("ap::mod_proxy::http::handler::new_connection",
1817 + AP_HOOK_SIG4(ptr,ptr,ptr,ptr),
1818 + AP_HOOK_DECLINE(NULL),
1819 + &errmsg, r, f, peer);
1820 + if (errmsg != NULL)
1821 + return ap_proxyerror(r, HTTP_BAD_GATEWAY, errmsg);
1825 ap_hard_timeout("proxy send", r);
1826 ap_bvputs(f, r->method, " ", proxyhost ? url : urlptr, " HTTP/1.1" CRLF,
1830 + int rc = DECLINED;
1831 + ap_hook_use("ap::mod_proxy::http::handler::write_host_header",
1832 + AP_HOOK_SIG6(int,ptr,ptr,ptr,int,ptr),
1833 + AP_HOOK_DECLINE(DECLINED),
1834 + &rc, r, f, desthost, destport, destportstr);
1835 + if (rc == DECLINED) {
1836 + if (destportstr != NULL && destport != DEFAULT_HTTP_PORT)
1837 + ap_bvputs(f, "Host: ", desthost, ":", destportstr, CRLF, NULL);
1839 + ap_bvputs(f, "Host: ", desthost, CRLF, NULL);
1843 /* Send Host: now, adding it to req_hdrs wouldn't be much better */
1844 if (destportstr != NULL && destport != DEFAULT_HTTP_PORT)
1845 ap_bvputs(f, "Host: ", desthost, ":", destportstr, CRLF, NULL);
1847 ap_bvputs(f, "Host: ", desthost, CRLF, NULL);
1850 if (conf->viaopt == via_block) {
1851 /* Block all outgoing Via: headers */
1853 +---------------------------------------------------------------------------
1854 | Add EAPI hooks in module structure for APXS generated samples.
1855 +---------------------------------------------------------------------------
1856 Index: src/support/apxs.pl
1857 --- src/support/apxs.pl 27 Mar 2002 15:23:11 -0000 1.1.1.11
1858 +++ src/support/apxs.pl 27 Mar 2002 15:30:03 -0000 1.11
1859 @@ -704,5 +704,11 @@
1860 NULL, /* child_init */
1861 NULL, /* child_exit */
1862 NULL /* [#0] post read-request */
1864 + ,NULL, /* EAPI: add_module */
1865 + NULL, /* EAPI: remove_module */
1866 + NULL, /* EAPI: rewrite_command */
1867 + NULL /* EAPI: new_connection */
1872 +---------------------------------------------------------------------------
1873 | Add the EAPI functions, so the stuff can be built under AIX
1874 | and similar braindead platforms as DSO.
1875 +---------------------------------------------------------------------------
1876 Index: src/support/httpd.exp
1877 --- src/support/httpd.exp 27 Mar 2002 15:23:12 -0000 1.1.1.10
1878 +++ src/support/httpd.exp 27 Mar 2002 15:30:03 -0000 1.12
1879 @@ -423,3 +423,59 @@
1880 XML_SetUnparsedEntityDeclHandler
1882 XML_UseParserAsHandlerArg
1883 +ap_add_config_define
1884 +ap_make_shared_sub_pool
1893 +ap_hook_unregister_I
1928 +ap_mm_core_permission
1933 +ap_mm_core_maxsegsize
1934 +ap_mm_core_align2page
1935 +ap_mm_core_align2word
1936 +ap_mm_lib_error_set
1937 +ap_mm_lib_error_get
1940 +---------------------------------------------------------------------------
1941 | Add the EAPI functions, so the stuff can be built under
1942 | Windows 95 and similar braindead platforms as DDL.
1943 +---------------------------------------------------------------------------
1944 Index: src/ApacheCore.def
1945 --- src/ApacheCore.def 27 Mar 2002 15:22:53 -0000 1.1.1.9
1946 +++ src/ApacheCore.def 27 Mar 2002 15:30:02 -0000 1.13
1947 @@ -444,3 +444,67 @@
1949 ap_get_chunk_size @440
1950 ap_escape_logitem @441
1952 + ; EAPI extended symbols
1953 + ; note; no ID's, so these all bind by name rather than ordinal since
1954 + ; their ordinals would change with symbol changes in the distribution
1955 + ap_add_config_define
1956 + ap_global_ctx DATA
1964 + ap_hook_register_I
1965 + ap_hook_unregister_I
1969 + ap_set_callback_and_alarm
1971 + ap_make_shared_sub_pool
2002 + ap_mm_display_info
2004 + ap_mm_core_permission
2009 + ap_mm_core_align2page
2010 + ap_mm_core_align2word
2011 + ap_mm_lib_error_set
2012 + ap_mm_lib_error_get