bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'refs/remotes/origin/develop' into issue/missing-private-image-src

Browse source 
# Conflicts:
#	doc/htconfig.md
This commit is contained in:
Hypolite Petovan 2016-12-07 23:15:46 -05:00
commit 88e336b3bc
22 changed files with 5065 additions and 5022 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/identity.php
View file

@ -813,7 +813,6 @@ function zrl_init(&$a) {
$result = Cache::get("gprobe:".$urlparts["host"]);
if (!is_null($result)) {
$result = unserialize($result);
if (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
logger("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), LOGGER_DEBUG);
return;

2
include/oembed.php
View file

@ -261,7 +261,7 @@ function oembed_iframe($src, $width, $height) {
$width = '100%';
$s = App::get_baseurl() . '/oembed/'.base64url_encode($src);
return '<iframe onload="resizeIframe(this);" class="embed_rich" height="' . $height . '" width="' . $width . '" src="' . $s . '" scrolling="no" frameborder="no">' . t('Embedded content') . '</iframe>';
return '<iframe onload="resizeIframe(this);" class="embed_rich" height="' . $height . '" width="' . $width . '" src="' . $s . '" allowfullscreen scrolling="no" frameborder="no">' . t('Embedded content') . '</iframe>';
}