From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 16 Oct 2020 16:38:34 +0000 (+0200)
Subject: Merge branch 'PHP-8.0'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a669fa3d6e87eeca3d8e25d36d5bc30b96df0a5;p=php

Merge branch 'PHP-8.0'

* PHP-8.0:
  Properly handle NULL output start filename
---

9a669fa3d6e87eeca3d8e25d36d5bc30b96df0a5
diff --cc main/output.c
index a31ea9cfad,d155123834..bdeca894f2
--- a/main/output.c
+++ b/main/output.c
@@@ -758,7 -758,7 +758,7 @@@ PHPAPI void php_output_set_implicit_flu
   * Get the file name where output has started */
  PHPAPI const char *php_output_get_start_filename(void)
  {
- 	return ZSTR_VAL(OG(output_start_filename));
 -	return OG(output_start_filename_str) ? ZSTR_VAL(OG(output_start_filename_str)) : NULL;
++	return OG(output_start_filename) ? ZSTR_VAL(OG(output_start_filename)) : NULL;
  }
  /* }}} */