You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2004/02/05 18:39:28 UTC
cvs commit: apache-1.3/src/main http_core.c http_main.c
trawick 2004/02/05 09:39:28
Modified: src/include http_conf_globals.h
src/main http_core.c http_main.c
Log:
fix buglet in previously-committed prctl() feature
before this patch, prctl() would be issued even if CoreDumpDirectory
was not coded... no big deal, but not intended
now the behavior matches that of httpd 2.*
Submitted by: Jeff Trawick
Reviewed by: Bill Stoddard, Greg Ames
Revision Changes Path
1.55 +1 -0 apache-1.3/src/include/http_conf_globals.h
Index: http_conf_globals.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/http_conf_globals.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- http_conf_globals.h 28 Jan 2004 21:22:21 -0000 1.54
+++ http_conf_globals.h 5 Feb 2004 17:39:28 -0000 1.55
@@ -127,6 +127,7 @@
* is some memory corruption, so we allocate it statically.
*/
extern API_VAR_EXPORT char ap_coredump_dir[MAX_STRING_LEN];
+extern int ap_coredump_dir_configured;
#ifdef __cplusplus
}
1.330 +1 -0 apache-1.3/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- http_core.c 28 Jan 2004 21:22:21 -0000 1.329
+++ http_core.c 5 Feb 2004 17:39:28 -0000 1.330
@@ -2723,6 +2723,7 @@
" does not exist or is not a directory", NULL);
}
ap_cpystrn(ap_coredump_dir, arg, sizeof(ap_coredump_dir));
+ ap_coredump_dir_configured = 1;
return NULL;
}
1.609 +3 -3 apache-1.3/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.608
retrieving revision 1.609
diff -u -r1.608 -r1.609
--- http_main.c 28 Jan 2004 21:22:21 -0000 1.608
+++ http_main.c 5 Feb 2004 17:39:28 -0000 1.609
@@ -315,8 +315,8 @@
API_VAR_EXPORT char ap_server_root[MAX_STRING_LEN]="";
API_VAR_EXPORT char ap_server_confname[MAX_STRING_LEN]="";
-#define DEFAULT_COREDUMP_DIR ""
-API_VAR_EXPORT char ap_coredump_dir[MAX_STRING_LEN]=DEFAULT_COREDUMP_DIR;
+API_VAR_EXPORT char ap_coredump_dir[MAX_STRING_LEN]="";
+int ap_coredump_dir_configured=0;
API_VAR_EXPORT array_header *ap_server_pre_read_config=NULL;
API_VAR_EXPORT array_header *ap_server_post_read_config=NULL;
@@ -4347,7 +4347,7 @@
#endif
#ifdef HAVE_SET_DUMPABLE
- if (strcmp(ap_coredump_dir, DEFAULT_COREDUMP_DIR)) {
+ if (ap_coredump_dir_configured) {
/* user set CoredumpDirectory, so they want to get core dumps
*/
if (prctl(PR_SET_DUMPABLE, 1)) {