holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed wrong condition only giving a location header if requests fails, not if it succeeds

Browse Source
This commit is contained in:
Ralf Becker 2013-08-02 19:28:38 +00:00
parent eea5de1559
commit 6fe4085a11
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpgwapi/inc/class.groupdav_handler.inc.php
View File

@ -489,6 +489,7 @@ abstract class groupdav_handler
*/ */
function put_response_headers($entry, $path, $retval, $path_attr_is_name=true, $etag=null) function put_response_headers($entry, $path, $retval, $path_attr_is_name=true, $etag=null)
{ {
//error_log(__METHOD__."(".array2string($entry).", '$path', ".array2string($retval).", path_attr_is_name=$path_attr_is_name, etag=".array2string($etag).")");
// we should not return an etag here, as EGroupware never stores ical/vcard byte-by-byte // we should not return an etag here, as EGroupware never stores ical/vcard byte-by-byte
// as SOGO Connector requires ETag header to recognice as successful PUT, we are sending them again for it // as SOGO Connector requires ETag header to recognice as successful PUT, we are sending them again for it
// --> as all clients dislike not getting an ETag for a PUT, we sending it again even not storing byte-by-byte // --> as all clients dislike not getting an ETag for a PUT, we sending it again even not storing byte-by-byte
@ -498,7 +499,7 @@ abstract class groupdav_handler
header('ETag: "'.$etag.'"'); header('ETag: "'.$etag.'"');
} }
// send Location header only on success AND if we dont use caldav_name as path-attribute or // send Location header only on success AND if we dont use caldav_name as path-attribute or
if (!(is_bool($retval) ? $retval : $retval[0] === '2') && (!$path_attr_is_name || if ((is_bool($retval) ? $retval : $retval[0] === '2') && (!$path_attr_is_name ||
// POST with add-member query parameter // POST with add-member query parameter
$_SERVER['REQUEST_METHOD'] == 'POST' && isset($_GET['add-member']))) $_SERVER['REQUEST_METHOD'] == 'POST' && isset($_GET['add-member'])))
{ {