From a639ee6c703cbaa9a89e195c343c473ee57294c6 Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.com>
Date: Tue, 29 Dec 2015 19:42:56 -0500
Subject: [PATCH] append *-Autosubdomains as last rules to rewrite rules After this, it is possible to use both: - sub.domain.tld - *.domain.tld together with different folders by rewrite (with rewrite_type = L for sub.domain.tld) Before it was not clearified which rule matches first, it always dependet on the creation-time of the subdomain
---
interface/lib/classes/ispconfig_request.inc.php | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/interface/lib/classes/ispconfig_request.inc.php b/interface/lib/classes/ispconfig_request.inc.php
index b29ae23..479c11b 100644
--- a/interface/lib/classes/ispconfig_request.inc.php
+++ b/interface/lib/classes/ispconfig_request.inc.php
@@ -53,8 +53,7 @@
$url_info = parse_url($url);
if(isset($url_info['scheme']) && $url_info['scheme'] == 'https') {
$port = isset($url_info['port']) ? $url_info['port'] : 443;
- //@$fp = stream_socket_client('ssl://' . $url_info['host'] . ':' . $port, $errno, $errstr, 10, STREAM_CLIENT_CONNECT, stream_context_create(array('ssl' => array('ciphers' => 'ALL:!AES:!3DES:!RC4:@STRENGTH'))));
- @$fp = fsockopen('sslv3://' . $url_info['host'], $port, $errno, $errstr, 10);
+ @$fp = fsockopen('tls://' . $url_info['host'], $port, $errno, $errstr, 10);
} else {
$port = isset($url_info['port']) ? $url_info['port'] : 80;
@$fp = fsockopen($url_info['host'], $port, $errno, $errstr, 10);
@@ -169,8 +168,7 @@
$url_info = parse_url($url);
if((isset($url_info['scheme']) && $url_info['scheme'] == 'https') || $url_info['port'] == 443) {
$port = (!isset($url_info['port']) || !$url_info['port'] || $url_info['port'] == 443 || $url_info['port'] == 80) ? 443 : $url_info['port'];
- //@$fp = stream_socket_client('ssl://' . $url_info['host'] . ':' . $port, $errno, $errstr, 10, STREAM_CLIENT_CONNECT, stream_context_create(array('ssl' => array('ciphers' => 'ALL:!AES:!3DES:!RC4:@STRENGTH'))));
- @$fp = fsockopen('sslv3://' . $url_info['host'], $port, $errno, $errstr, 10);
+ @$fp = fsockopen('tls://' . $url_info['host'], $port, $errno, $errstr, 10);
} else {
$port = isset($url_info['port']) ? $url_info['port'] : 80;
@$fp = fsockopen($url_info['host'], $port, $errno, $errstr, 10);
--
Gitblit v1.9.1