cvs commit: apache/src CHANGES mod_include.c
dgaudet 97/07/28 01:46:45
Modified:src CHANGES mod_include.c
Log:
fixed unused handle_endif
Submitted by: Howard Fear
Reviewed by: Dean Gaudet, Marc Slemko
Revision ChangesPath
1.369 +4 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- CHANGES 1997/07/27 02:38:03 1.368
+++ CHANGES 1997/07/28 08:46:41 1.369
@@ -1,5 +1,9 @@
Changes with Apache 1.3a2
+ *) mod_include cleanup showed that handle_else was being used to handle
+ endif. It didn't cause problems, but it was cleaned up too.
+ [Howard Fear]
+
*) mod_cern_meta would attempt to find meta files for the directory itself
in some cases, but not in others. It now avoids it in all cases.
[Dean Gaudet]
1.45 +2 -2 apache/src/mod_include.c
Index: mod_include.c
===
RCS file: /export/home/cvs/apache/src/mod_include.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- mod_include.c 1997/07/27 01:43:26 1.44
+++ mod_include.c 1997/07/28 08:46:42 1.45
@@ -1728,6 +1728,7 @@
#ifdef DEBUG_INCLUDE
rvputs(r, endif conditional_status=\, *conditional_status ? 1 :
0, \\n, NULL);
#endif
+*printing = 1;
*conditional_status = 1;
return 0;
} else {
@@ -1843,8 +1844,7 @@
continue;
} else if (!strcmp(directive, endif)) {
if (!if_nesting) {
-ret = handle_else(f, r, error, conditional_status,
printing);
-printing = 1;
+ret = handle_endif(f, r, error, conditional_status,
printing);
} else {
if_nesting--;
}
cvs commit: apache/src http_main.c
dgaudet 97/07/28 02:59:23
Modified:src http_main.c
Log:
Solaris whines about the const struct sockaddr_in. Silly solaris.
Revision ChangesPath
1.188 +1 -1 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- http_main.c 1997/07/24 04:35:47 1.187
+++ http_main.c 1997/07/28 09:59:21 1.188
@@ -1861,7 +1861,7 @@
/* MPE requires CAP=PM and GETPRIVMODE to bind to ports less than 1024 */
if (ntohs(server-sin_port) 1024) GETPRIVMODE();
#endif
-if(bind(s, (const struct sockaddr *)server,sizeof(struct sockaddr_in))
== -1)
+if(bind(s, (struct sockaddr *)server,sizeof(struct sockaddr_in)) == -1)
{
perror(bind);
#ifdef MPE
cvs commit: apache/src http_main.c
dgaudet 97/07/28 04:02:32
Modified:src http_main.c
Log:
Log a failed listen... perhaps it will help with diagnosing the bizarre
accept() error loops.
Revision ChangesPath
1.189 +10 -3 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- http_main.c 1997/07/28 09:59:21 1.188
+++ http_main.c 1997/07/28 11:02:31 1.189
@@ -1948,7 +1948,12 @@
sock_bind (s, server);
#endif
-listen(s, listenbacklog);
+if (listen(s, listenbacklog) == -1) {
+ log_unixerr (listen, NULL, unable to listen for connections,
+ server_conf);
+ close (s);
+ return -1;
+}
return s;
}
@@ -2033,8 +2038,10 @@
if (fd 0) {
fd = make_sock (p, lr-local_addr);
}
- FD_SET (fd, listenfds);
- if (fd listenmaxfd) listenmaxfd = fd;
+ if (fd = 0) {
+ FD_SET (fd, listenfds);
+ if (fd listenmaxfd) listenmaxfd = fd;
+ }
lr-fd = fd;
if (lr-next == NULL) break;
lr = lr-next;
cvs commit: apache/src/modules/proxy mod_proxy.c
dougm 97/07/28 11:23:30
Modified:src CHANGES http_config.c http_config.h http_core.c
http_main.c mod_access.c mod_actions.c mod_alias.c
mod_asis.c mod_auth.c mod_auth_anon.c
mod_auth_db.c mod_auth_dbm.c mod_autoindex.c
mod_browser.c mod_cern_meta.c mod_cgi.c
mod_digest.c mod_dir.c mod_dld.c mod_env.c
mod_expires.c mod_headers.c mod_imap.c
mod_include.c mod_info.c mod_log_agent.c
mod_log_config.c mod_log_referer.c mod_mime.c
mod_mime_magic.c mod_negotiation.c mod_rewrite.c
mod_status.c mod_userdir.c mod_usertrack.c
src/modules/example mod_example.c
src/modules/proxy mod_proxy.c
Log:
added child_exit hook for modules
Submitted by: Doug MacEachern
Reviewed by: Dean Gaudet
Revision ChangesPath
1.370 +6 -1 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -r1.369 -r1.370
--- CHANGES 1997/07/28 08:46:41 1.369
+++ CHANGES 1997/07/28 18:22:40 1.370
@@ -1,5 +1,10 @@
Changes with Apache 1.3a2
+ *) API: Added child_exit function to module structure. This is called
+ once per heavy-weight process just before a server child exit()'s
+ e.g. when max_requests_per_child is reached, etc.
+ [Doug MacEachern, Dean Gaudet]
+
*) mod_include cleanup showed that handle_else was being used to handle
endif. It didn't cause problems, but it was cleaned up too.
[Howard Fear]
@@ -390,7 +395,7 @@
*) Fixed open timestamp fd in proxy_cache.c [Chuck Murcko]
*) Added undocumented perl SSI mechanism for -DUSE_PERL_SSI and mod_perl.
- [Rob Hartill]
+ [Doug MacEachern, Rob Hartill]
*) Proxy needs to use hard_timeout instead of soft_timeout when it is
reading from one buffer and writing to another, at least until it has
1.68 +18 -0 apache/src/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache/src/http_config.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- http_config.c 1997/07/27 03:13:30 1.67
+++ http_config.c 1997/07/28 18:22:42 1.68
@@ -1242,6 +1242,24 @@
(*m-child_init) (s, p);
}
+void child_exit_modules(pool *p, server_rec *s)
+{
+module *m;
+
+#ifdef SIGHUP
+signal (SIGHUP, SIG_IGN);
+#endif
+#ifdef SIGUSR1
+signal (SIGUSR1, SIG_IGN);
+#endif
+
+for (m = top_module; m; m = m-next)
+if (m-child_exit)
+ (*m-child_exit) (s, p);
+
+exit(0);
+}
+
/
* Configuration directives are restricted in terms of where they may
* appear in the main configuration files and/or .htaccess files according
1.41 +8 -1 apache/src/http_config.h
Index: http_config.h
===
RCS file: /export/home/cvs/apache/src/http_config.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- http_config.h 1997/07/21 05:53:42 1.40
+++ http_config.h 1997/07/28 18:22:43 1.41
@@ -233,6 +233,12 @@
#else
void (*child_init)(server_rec *, pool *);
#endif
+#ifdef ULTRIX_BRAIN_DEATH
+void (*child_exit)();
+#else
+void (*child_exit)(server_rec *, pool *);
+#endif
+
} module;
/* Initializer for the first few module slots, which are only
@@ -242,7 +248,7 @@
* handle it back-compatibly, or at least signal an error).
*/
-#define MODULE_MAGIC_NUMBER 19970719
+#define MODULE_MAGIC_NUMBER 19970728
#define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL
/* Generic accessors for other modules to get at their own module-specific
@@ -282,6 +288,7 @@
server_rec *read_config (pool *conf_pool, pool *temp_pool, char
*config_name);
void init_modules(pool *p, server_rec *s);
void child_init_modules(pool *p, server_rec *s);
+void child_exit_modules(pool *p, server_rec *s);
void setup_prelinked_modules(void);
void show_directives(void);
void show_modules(void);
1.101 +2 -1 apache/src/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- http_core.c 1997/07/24 04:38:09 1.100
cvs commit: apache-site related_projects.html
brian 97/07/28 19:24:17 Modified:. related_projects.html Log: Updated with new location of JSDK/Apache integration pages. Revision ChangesPath 1.8 +6 -5 apache-site/related_projects.html Index: related_projects.html === RCS file: /export/home/cvs/apache-site/related_projects.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- related_projects.html 1997/07/23 01:11:55 1.7 +++ related_projects.html 1997/07/29 02:24:16 1.8 @@ -154,12 +154,13 @@ H3Apache/JSDK integration work/H3 A project to fully integrate Java servlet technology is underway. -There is a mailing list for people working on or just interested in -the effort; send a message to A -HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/A with the sentence -Subscribe JSDK-Apache in the message *body* (not the subject). -PHR +BLOCKQUOTE +For more information check out the A HREF=http://java.apache.org/; +JSDK/Apache/A site. +/BLOCKQUOTE + +HR A HREF=./IMG SRC=images/apache_home.gif ALT=Home/A
