Merge pull request #117 from aaronpk/issue-106

aaronpk · web-flow · commit a3eb26f688b8 · 2017-05-25T07:05:38.000-07:00
send `Accept: text/html` header
diff --git a/Mf2/Parser.php b/Mf2/Parser.php
@@ -69,6 +69,9 @@ function fetch($url, $convertClassic = true, &$curlInfo=null) {
 	curl_setopt($ch, CURLOPT_HEADER, 0);
 	curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
 	curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
+	curl_setopt($ch, CURLOPT_HTTPHEADER, array(
+		'Accept: text/html'
+	));
 	$html = curl_exec($ch);
 	$info = $curlInfo = curl_getinfo($ch);
 	curl_close($ch);
diff --git a/bin/fetch-mf2 b/bin/fetch-mf2
@@ -31,9 +31,7 @@ if (!file_exists($url)) {
 	}
 }
 
-$html = file_get_contents($url);
-
-$result = Mf2\parse($html, $url);
+$result = Mf2\fetch($url);
 
 if (defined('JSON_PRETTY_PRINT')) {
 	echo json_encode($result, JSON_PRETTY_PRINT);

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,7 @@ if (!file_exists($url)) {`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`		`-$html = file_get_contents($url);`
`35`		`-`
`36`		`-$result = Mf2\parse($html, $url);`
	`34`	`+$result = Mf2\fetch($url);`
`37`	`35`
`38`	`36`	`if (defined('JSON_PRETTY_PRINT')) {`
`39`	`37`	`echo json_encode($result, JSON_PRETTY_PRINT);`