##
## Annotated patch file: eapi.patch
## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved.
-## Created on: 30-Mar-2001
+## Created on: 20-May-2001
##
## This file assembles changes to existing Apache source files
## between the original Apache and the patched variant. It can be
| Patch in implementation of the EAPI rule.
+---------------------------------------------------------------------------
Index: src/Configure
---- src/Configure 2001/02/28 19:40:46 1.1.1.14
-+++ src/Configure 2001/02/28 19:44:33 1.16
-@@ -1808,6 +1808,72 @@
+--- src/Configure 2001/05/20 08:16:15 1.1.1.15
++++ src/Configure 2001/05/20 08:23:01 1.17
+@@ -1829,6 +1829,72 @@
fi
####################################################################
| Add the build support for the ap_hook.c and ap_ctx.c sources (Unix)
+---------------------------------------------------------------------------
Index: src/ap/Makefile.tmpl
---- src/ap/Makefile.tmpl 2000/10/12 08:17:28 1.1.1.6
-+++ src/ap/Makefile.tmpl 2000/10/12 08:31:47 1.6
+--- src/ap/Makefile.tmpl 2001/05/20 08:16:15 1.1.1.7
++++ src/ap/Makefile.tmpl 2001/05/20 08:23:01 1.7
@@ -6,7 +6,8 @@
LIB=libap.a
OBJS=ap_cpystrn.o ap_execve.o ap_fnmatch.o ap_getpass.o ap_md5c.o ap_signal.o \
-- ap_slack.o ap_snprintf.o ap_sha1.o ap_checkpass.o ap_base64.o
-+ ap_slack.o ap_snprintf.o ap_sha1.o ap_checkpass.o ap_base64.o \
+- ap_slack.o ap_snprintf.o ap_sha1.o ap_checkpass.o ap_base64.o ap_ebcdic.o
++ ap_slack.o ap_snprintf.o ap_sha1.o ap_checkpass.o ap_base64.o ap_ebcdic.o \
+ ap_hook.o ap_ctx.o ap_mm.o
.c.o:
| Add the build support for the ap_hook.c and ap_ctx.c sources (Win32)
+---------------------------------------------------------------------------
Index: src/ap/ap.mak
---- src/ap/ap.mak 2001/01/23 11:35:02 1.1.1.7
-+++ src/ap/ap.mak 2001/01/23 11:48:05 1.7
+--- src/ap/ap.mak 2001/05/20 08:16:15 1.1.1.8
++++ src/ap/ap.mak 2001/05/20 08:23:01 1.8
@@ -52,6 +52,9 @@
-@erase "$(INTDIR)\ap_cpystrn.obj"
-@erase "$(INTDIR)\ap_fnmatch.obj"
| function.
+---------------------------------------------------------------------------
Index: src/include/httpd.h
---- src/include/httpd.h 2001/02/28 19:40:48 1.1.1.14
-+++ src/include/httpd.h 2001/02/28 19:44:33 1.23
+--- src/include/httpd.h 2001/05/20 08:16:17 1.1.1.15
++++ src/include/httpd.h 2001/05/20 08:23:02 1.25
@@ -70,7 +70,19 @@
/* Headers in which EVERYONE has an interest... */
#define DEFAULT_HTTPS_PORT 443
#define ap_is_default_port(port,r) ((port) == ap_default_port(r))
+#ifdef EAPI
-+#define ap_http_method(r) (ap_ctx_get((r)->ctx, "ap::http::method") != NULL ? ((char *)ap_ctx_get((r)->ctx, "ap::http::method")) : "http")
-+#define ap_default_port(r) (ap_ctx_get((r)->ctx, "ap::default::port") != NULL ? atoi((char *)ap_ctx_get((r)->ctx, "ap::default::port")) : DEFAULT_HTTP_PORT)
++#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")
++#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)
+#else /* EAPI */
#define ap_http_method(r) "http"
#define ap_default_port(r) DEFAULT_HTTP_PORT
/* --------- Default user name and group name running standalone ---------- */
/* --- These may be specified as numbers by placing a # before a number --- */
-@@ -354,6 +371,19 @@
+@@ -356,6 +373,19 @@
#define SCOREBOARD_MAINTENANCE_INTERVAL 1000000
#endif
/* Number of requests to try to handle in a single process. If <= 0,
* the children don't die off. That's the default here, since I'm still
* interested in finding and stanching leaks.
-@@ -446,6 +476,9 @@
+@@ -448,6 +478,9 @@
API_EXPORT(const char *) ap_get_server_version(void);
API_EXPORT(void) ap_add_version_component(const char *component);
API_EXPORT(const char *) ap_get_server_built(void);
/* Numeric release version identifier: MMNNFFRBB: major minor fix final beta
* Always increases along the same track as the source branch.
-@@ -838,6 +871,10 @@
+@@ -851,6 +884,10 @@
* record to improve 64bit alignment the next time we need to break
* binary compatibility for some other reason.
*/
};
-@@ -886,6 +923,9 @@
+@@ -899,6 +936,9 @@
char *local_host; /* used for ap_get_server_name when
* UseCanonicalName is set to DNS
* (ignores setting of HostnameLookups) */
};
/* Per-vhost config... */
-@@ -958,6 +998,10 @@
+@@ -971,6 +1011,10 @@
int limit_req_line; /* limit on size of the HTTP request line */
int limit_req_fieldsize; /* limit on size of any request header field */
int limit_req_fields; /* limit on number of request header fields */
| is added plus the initialization of one more `ctx' variable.
+---------------------------------------------------------------------------
Index: src/main/http_main.c
---- src/main/http_main.c 2001/02/28 19:40:49 1.1.1.13
-+++ src/main/http_main.c 2001/03/02 23:45:42 1.35
+--- src/main/http_main.c 2001/05/20 08:16:18 1.1.1.14
++++ src/main/http_main.c 2001/05/20 08:23:02 1.36
@@ -260,6 +260,9 @@
int ap_listenbacklog;
int ap_dump_settings = 0;
return conn;
}
-@@ -3647,6 +3712,15 @@
+@@ -3648,6 +3713,15 @@
printf("Server's Module Magic Number: %u:%u\n",
MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
printf("Server compiled with....\n");
#ifdef BIG_SECURITY_HOLE
printf(" -D BIG_SECURITY_HOLE\n");
#endif
-@@ -3800,6 +3874,22 @@
+@@ -3801,6 +3875,22 @@
ap_server_pre_read_config = ap_make_array(pcommands, 1, sizeof(char *));
ap_server_post_read_config = ap_make_array(pcommands, 1, sizeof(char *));
ap_server_config_defines = ap_make_array(pcommands, 1, sizeof(char *));
}
#ifndef MULTITHREAD
-@@ -4219,6 +4309,9 @@
+@@ -4220,6 +4310,9 @@
ap_sync_scoreboard_image();
if (ap_scoreboard_image->global.running_generation != ap_my_generation) {
ap_bclose(conn_io);
clean_child_exit(0);
}
-@@ -4247,6 +4340,9 @@
+@@ -4248,6 +4341,9 @@
*/
#ifdef NO_LINGCLOSE
ap_bclose(conn_io); /* just close it */
#else
if (r && r->connection
-@@ -4257,6 +4353,9 @@
+@@ -4258,6 +4354,9 @@
lingering_close(r);
}
else {
ap_bsetflag(conn_io, B_EOUT, 1);
ap_bclose(conn_io);
}
-@@ -4981,16 +5080,31 @@
+@@ -4982,16 +5081,31 @@
usage(argv[0]);
}
}
}
child_timeouts = !ap_standalone || one_process;
-@@ -5120,6 +5234,10 @@
+@@ -5121,6 +5235,10 @@
ap_destroy_pool(r->pool);
}
ap_bclose(cio);
}
exit(0);
-@@ -5466,6 +5584,9 @@
+@@ -5467,6 +5585,9 @@
ap_kill_cleanups_for_socket(ptrans, csd);
#ifdef NO_LINGCLOSE
ap_bclose(conn_io); /* just close it */
#else
if (r && r->connection
-@@ -5476,6 +5597,9 @@
+@@ -5477,6 +5598,9 @@
lingering_close(r);
}
else {
ap_bsetflag(conn_io, B_EOUT, 1);
ap_bclose(conn_io);
}
-@@ -6989,6 +7113,10 @@
+@@ -7002,6 +7126,10 @@
if (!conf_specified)
ap_cpystrn(ap_server_confname, SERVER_CONFIG_FILE, sizeof(ap_server_confname));
if (!ap_os_is_path_absolute(ap_server_confname))
ap_cpystrn(ap_server_confname,
ap_server_root_relative(pcommands, ap_server_confname),
-@@ -7030,6 +7158,9 @@
+@@ -7043,6 +7171,9 @@
}
#else /* ndef WIN32 */
server_conf = ap_read_config(pconf, ptrans, ap_server_confname);
| conn_rec structures.
+---------------------------------------------------------------------------
Index: src/main/http_request.c
---- src/main/http_request.c 2001/02/28 19:40:49 1.1.1.11
-+++ src/main/http_request.c 2001/02/28 19:44:34 1.10
-@@ -1404,6 +1404,9 @@
- new->no_local_copy = r->no_local_copy;
- new->read_length = r->read_length; /* We can only read it once */
- new->vlist_validator = r->vlist_validator;
+--- src/main/http_request.c 2001/05/20 08:16:18 1.1.1.12
++++ src/main/http_request.c 2001/05/20 08:23:02 1.12
+@@ -1374,6 +1374,10 @@
+
+ new->method = r->method;
+ new->method_number = r->method_number;
+#ifdef EAPI
++ /* initialize context _BEFORE_ ap_parse_uri() call */
+ new->ctx = r->ctx;
+#endif /* EAPI */
-
- ap_table_setn(new->subprocess_env, "REDIRECT_STATUS",
- ap_psprintf(r->pool, "%d", r->status));
+ ap_parse_uri(new, new_uri);
+ new->request_config = ap_create_request_config(r->pool);
+ new->per_dir_config = r->server->lookup_defaults;
+---------------------------------------------------------------------------
| Just add the initialization of the `ctx' variable for
| request_rec structures.
+---------------------------------------------------------------------------
Index: src/main/http_protocol.c
---- src/main/http_protocol.c 2001/02/28 19:40:49 1.1.1.12
-+++ src/main/http_protocol.c 2001/02/28 19:44:34 1.12
-@@ -1105,6 +1105,10 @@
+--- src/main/http_protocol.c 2001/05/20 08:16:18 1.1.1.13
++++ src/main/http_protocol.c 2001/05/20 08:23:02 1.13
+@@ -1110,6 +1110,10 @@
r->status = HTTP_REQUEST_TIME_OUT; /* Until we get a request */
r->the_request = NULL;
+#endif /* EAPI */
+
#ifdef CHARSET_EBCDIC
- ap_bsetflag(r->connection->client, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 1);
- #endif
-@@ -1252,6 +1256,11 @@
+ ap_bsetflag(r->connection->client, B_ASCII2EBCDIC, r->ebcdic.conv_in = 1);
+ ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, r->ebcdic.conv_out = 1);
+@@ -1258,6 +1262,11 @@
rnew->read_body = REQUEST_NO_BODY;
rnew->main = (request_rec *) r;
| Add support for loading both EAPI and AP13 modules.
+---------------------------------------------------------------------------
Index: src/modules/standard/mod_so.c
---- src/modules/standard/mod_so.c 2001/01/23 11:35:13 1.1.1.6
-+++ src/modules/standard/mod_so.c 2001/01/23 11:48:08 1.7
-@@ -263,11 +263,24 @@
+--- src/modules/standard/mod_so.c 2001/05/20 08:16:21 1.1.1.7
++++ src/modules/standard/mod_so.c 2001/05/20 08:23:02 1.8
+@@ -266,11 +266,24 @@
* Make sure the found module structure is really a module structure
*
*/
| variables from other modules.
+---------------------------------------------------------------------------
Index: src/modules/standard/mod_rewrite.c
---- src/modules/standard/mod_rewrite.c 2001/02/28 19:40:52 1.1.1.10
-+++ src/modules/standard/mod_rewrite.c 2001/02/28 19:44:34 1.8
-@@ -3637,6 +3637,15 @@
+--- src/modules/standard/mod_rewrite.c 2001/05/20 08:16:21 1.1.1.11
++++ src/modules/standard/mod_rewrite.c 2001/05/20 08:23:02 1.9
+@@ -3678,6 +3678,15 @@
}
#endif /* ndef WIN32 && NETWARE*/
| the status HTML page.
+---------------------------------------------------------------------------
Index: src/modules/standard/mod_status.c
---- src/modules/standard/mod_status.c 2001/01/23 11:35:14 1.1.1.11
-+++ src/modules/standard/mod_status.c 2001/01/23 11:48:08 1.8
-@@ -711,6 +748,12 @@
+--- src/modules/standard/mod_status.c 2001/05/20 08:16:21 1.1.1.12
++++ src/modules/standard/mod_status.c 2001/05/20 08:23:02 1.9
+@@ -715,6 +752,12 @@
</table>\n", r);
#endif
}
| Add EAPI hooks in module structure for APXS generated samples.
+---------------------------------------------------------------------------
Index: src/support/apxs.pl
---- src/support/apxs.pl 2001/01/23 11:35:14 1.1.1.9
-+++ src/support/apxs.pl 2001/01/23 11:48:09 1.9
-@@ -654,5 +654,11 @@
+--- src/support/apxs.pl 2001/05/20 08:16:25 1.1.1.10
++++ src/support/apxs.pl 2001/05/20 08:23:03 1.10
+@@ -703,5 +703,11 @@
NULL, /* child_init */
NULL, /* child_exit */
NULL /* [#0] post read-request */
projects / packages / apache.git / commitdiff