mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-29 03:13:40 +01:00
Fix Evolution CalDAV HTTP_IF_MATCH issue (Stylite#601)
This commit is contained in:
parent
97449cce68
commit
9593134a7c
@ -267,13 +267,16 @@ abstract class groupdav_handler
|
|||||||
$etag = $this->get_etag($entry);
|
$etag = $this->get_etag($entry);
|
||||||
// If the clients sends an "If-Match" header ($_SERVER['HTTP_IF_MATCH']) we check with the current etag
|
// If the clients sends an "If-Match" header ($_SERVER['HTTP_IF_MATCH']) we check with the current etag
|
||||||
// of the calendar --> on failure we return 412 Precondition failed, to not overwrite the modifications
|
// of the calendar --> on failure we return 412 Precondition failed, to not overwrite the modifications
|
||||||
if (isset($_SERVER['HTTP_IF_MATCH']) && ($this->http_if_match = $_SERVER['HTTP_IF_MATCH']) != $etag)
|
if (isset($_SERVER['HTTP_IF_MATCH']) &&
|
||||||
|
($this->http_if_match = (strstr($_SERVER['HTTP_IF_MATCH'], $etag) === false)))
|
||||||
{
|
{
|
||||||
if ($this->debug) error_log(__METHOD__."($method,,$id) HTTP_IF_MATCH='$_SERVER[HTTP_IF_MATCH]', etag='$etag': 412 Precondition failed");
|
if ($this->debug) error_log(__METHOD__."($method,,$id) HTTP_IF_MATCH='$_SERVER[HTTP_IF_MATCH]', etag='$etag': 412 Precondition failed");
|
||||||
return '412 Precondition Failed';
|
return '412 Precondition Failed';
|
||||||
}
|
}
|
||||||
// if an IF_NONE_MATCH is given, check if we need to send a new export, or the current one is still up-to-date
|
// if an IF_NONE_MATCH is given, check if we need to send a new export, or the current one is still up-to-date
|
||||||
if ($method == 'GET' && isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] == $etag)
|
if ($method == 'GET' &&
|
||||||
|
isset($_SERVER['HTTP_IF_NONE_MATCH']) &&
|
||||||
|
strstr($_SERVER['HTTP_IF_MATCH'], $etag) !== false)
|
||||||
{
|
{
|
||||||
if ($this->debug) error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 304 Not Modified");
|
if ($this->debug) error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 304 Not Modified");
|
||||||
return '304 Not Modified';
|
return '304 Not Modified';
|
||||||
@ -334,7 +337,7 @@ abstract class groupdav_handler
|
|||||||
'zideone' => 'zideone', // zideone outlook plugin
|
'zideone' => 'zideone', // zideone outlook plugin
|
||||||
'lightning' => 'lightning', // Lighting (SOGo connector for addressbook)
|
'lightning' => 'lightning', // Lighting (SOGo connector for addressbook)
|
||||||
'khtml' => 'kde', // KDE clients
|
'khtml' => 'kde', // KDE clients
|
||||||
'cadaver' => 'cadaver',
|
'neon' => 'neon'
|
||||||
) as $pattern => $name)
|
) as $pattern => $name)
|
||||||
{
|
{
|
||||||
if (strpos($user_agent,$pattern) !== false)
|
if (strpos($user_agent,$pattern) !== false)
|
||||||
|
Loading…
Reference in New Issue
Block a user