Merge branch 'PHP-8.0'

* PHP-8.0:
  Properly handle NULL output start filename

diff --cc main/output.c
index a31ea9cfadee255999bf77f0774f65ec957af4c9,d15512383497bfa456d6bd6cd9e10d1194a512fc..bdeca894f25e311f9008113ae0c1175f1d1dfeb7
--- 1/main/output.c
--- 2/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;
  }
  /* }}} */