Commit 9a669fa3d6 for php.net

commit 9a669fa3d6e87eeca3d8e25d36d5bc30b96df0a5
Merge: d694e43c86 d6a18a7738
Author: Nikita Popov <nikita.ppv@gmail.com>
Date:   Fri Oct 16 18:38:34 2020 +0200

    Merge branch 'PHP-8.0'

    * PHP-8.0:
      Properly handle NULL output start filename

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;
  }
  /* }}} */