Skip to content

Commit 0eb3611

Browse files
Remove --disable-segfault-error (#285)
1 parent e9f540f commit 0eb3611

1 file changed

Lines changed: 1 addition & 13 deletions

File tree

configure.php

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ function usage() // {{{
6969
even if it fails validation [{$acd['FORCE_DOM_SAVE']}]
7070
--enable-chm Enable Windows HTML Help Edition pages [{$acd['CHMENABLED']}]
7171
--enable-xml-details Enable detailed XML error messages [{$acd['DETAILED_ERRORMSG']}]
72-
--disable-segfault-error LIBXML may segfault with broken XML, use this
73-
if it does [{$acd['SEGFAULT_ERROR']}]
7472
--disable-version-files Do not merge the extension specific
7573
version.xml files
7674
--disable-sources-file Do not generate sources.xml file
@@ -309,7 +307,6 @@ function find_xml_files($path) // {{{
309307
'FORCE_DOM_SAVE' => 'no',
310308
'PARTIAL' => 'no',
311309
'DETAILED_ERRORMSG' => 'no',
312-
'SEGFAULT_ERROR' => 'yes',
313310
'VERSION_FILES' => 'yes',
314311
'SOURCES_FILE' => 'yes',
315312
'HISTORY_FILE' => 'yes',
@@ -413,10 +410,6 @@ function find_xml_files($path) // {{{
413410
$ac['DETAILED_ERRORMSG'] = $v;
414411
break;
415412

416-
case 'segfault-error':
417-
$ac['SEGFAULT_ERROR'] = $v;
418-
break;
419-
420413
case 'version-files':
421414
$ac['VERSION_FILES'] = $v;
422415
break;
@@ -543,9 +536,6 @@ function find_xml_files($path) // {{{
543536
checking('whether to enable detailed XML error messages');
544537
checkvalue($ac['DETAILED_ERRORMSG']);
545538

546-
checking('whether to enable detailed error reporting (may segfault)');
547-
checkvalue($ac['SEGFAULT_ERROR']);
548-
549539
if ($ac["GENERATE"] != "no") {
550540
$ac["ONLYDIR"] = dirname(realpath($ac["GENERATE"]));
551541
}
@@ -611,9 +601,7 @@ function xml_configure()
611601
file_put_contents( __DIR__ . "/temp/manual.conf" , implode( "\n" , $conf ) );
612602
}
613603

614-
if ($ac['SEGFAULT_ERROR'] === 'yes') {
615-
libxml_use_internal_errors(true);
616-
}
604+
libxml_use_internal_errors(true);
617605

618606
globbetyglob("{$ac['basedir']}/scripts", 'make_scripts_executable');
619607

0 commit comments

Comments
 (0)