From 1bcd439cad5eefeef1fecbc9076b72ef76fb80b6 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikic@php.net>
Date: Wed, 3 Aug 2016 00:33:32 +0200
Subject: [PATCH] Fix bug #72724

---
 NEWS           | 3 +++
 main/rfc1867.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 27bd7b0275..af59ed1781 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ PHP                                                                        NEWS
 - GD:
   . Fixed bug #72709 (imagesetstyle() causes OOB read for empty $styles). (cmb)
 
+- Session:
+  . Fixed bug #72724 (PHP7: session-uploadprogress kills httpd). (Nikita)
+
 
 ?? ??? 2016 PHP 7.0.10
 
diff --git a/main/rfc1867.c b/main/rfc1867.c
index 14e72d91f5..afd982cca8 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -1099,7 +1099,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
 				multipart_event_file_end event_file_end;
 
 				event_file_end.post_bytes_processed = SG(read_post_bytes);
-				event_file_end.temp_filename = ZSTR_VAL(temp_filename);
+				event_file_end.temp_filename = temp_filename ? ZSTR_VAL(temp_filename) : NULL;
 				event_file_end.cancel_upload = cancel_upload;
 				if (php_rfc1867_callback(MULTIPART_EVENT_FILE_END, &event_file_end, &event_extra_data) == FAILURE) {
 					cancel_upload = UPLOAD_ERROR_X;
-- 
2.50.0