Merge branch 'maint'

Conflicts:
	erts/emulator/sys/vxworks/sys.c
	erts/vsn.mk
	lib/ssl/src/ssl_connection.erl
	lib/ssl/test/ssl_basic_SUITE.erl

2 files changed, 17 insertions, 3 deletions

diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index 63136d86c9..c1e9fe536d 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -670,6 +670,7 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
     char dumpnamebuf[MAXPATHLEN];
     char* dumpname;
     int secs;
+    int env_erl_crash_dump_seconds_set = 1;
 
     if (ERTS_SOMEONE_IS_CRASH_DUMPING)
 	return;
@@ -694,6 +695,8 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
 
     envsz = sizeof(env);
     /* ERL_CRASH_DUMP_SECONDS not set
+     * if we have a heart port, break immediately
+     * otherwise dump crash indefinitely (until crash is complete)
      * same as ERL_CRASH_DUMP_SECONDS = 0
      * - do not write dump
      * - do not set an alarm
@@ -715,8 +718,10 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
      */
 	
     if (erts_sys_getenv__("ERL_CRASH_DUMP_SECONDS", env, &envsz) != 0) {
-	return; /* break immediately */
+	env_erl_crash_dump_seconds_set = 0;
+	secs = -1;
     } else {
+	env_erl_crash_dump_seconds_set = 1;
 	secs = atoi(env);
     }
 
@@ -724,7 +729,16 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
 	return;
     }
 
-    erts_sys_prepare_crash_dump(secs);
+    /* erts_sys_prepare_crash_dump returns 1 if heart port is found, otherwise 0
+     * If we don't find heart (0) and we don't have ERL_CRASH_DUMP_SECONDS set
+     * we should continue writing a dump
+     *
+     * beware: secs -1 means no alarm
+     */
+
+    if (erts_sys_prepare_crash_dump(secs) && !env_erl_crash_dump_seconds_set ) {
+	return;
+    }
 
     if (erts_sys_getenv__("ERL_CRASH_DUMP",&dumpnamebuf[0],&dumpnamebufsize) != 0)
 	dumpname = "erl_crash.dump";
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h
index c5af5b9577..f5f10bb616 100644
--- a/erts/emulator/beam/sys.h
+++ b/erts/emulator/beam/sys.h
@@ -644,7 +644,7 @@ void erts_sys_schedule_interrupt_timed(int set, erts_short_time_t msec);
 void erts_sys_main_thread(void);
 #endif
 
-extern void erts_sys_prepare_crash_dump(int secs);
+extern int erts_sys_prepare_crash_dump(int secs);
 extern void erts_sys_pre_init(void);
 extern void erl_sys_init(void);
 extern void erl_sys_args(int *argc, char **argv);