nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-21 01:54:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use request ID

Browse Source
This commit is contained in:
Andrew Ruthven 2024-03-07 01:11:11 +13:00
parent f69480ce77
commit 658bd4e786
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/always.php
View File

@ -162,7 +162,7 @@ $c->readonly_webdav_collections = true; // WebDAV access is readonly
// Kind of private configuration values // Kind of private configuration values
$c->total_query_time = 0; $c->total_query_time = 0;
// Any many times GetMoreInstances in inc/RRule.php should loop trying to // How many times GetMoreInstances in inc/RRule.php should loop trying to
// find more instances. // find more instances.
$c->rrule_loop_limit = 100; $c->rrule_loop_limit = 100;

3
inc/CalDAVRequest.php
View File

@ -87,7 +87,7 @@ class CalDAVRequest
protected $exists; protected $exists;
/** /**
* The value of any 'Destionation:' header, if present. * The value of any 'Destination:' header, if present.
*/ */
var $destination; var $destination;
@ -1239,6 +1239,7 @@ EOSQL;
if ( !headers_sent() ) @header( sprintf("HTTP/1.1 %d %s", $status, getStatusMessage($status)) ); if ( !headers_sent() ) @header( sprintf("HTTP/1.1 %d %s", $status, getStatusMessage($status)) );
if ( !headers_sent() ) @header( sprintf("X-DAViCal-Version: DAViCal/%d.%d.%d; DB/%d.%d.%d", $c->code_major, $c->code_minor, $c->code_patch, $c->schema_major, $c->schema_minor, $c->schema_patch) ); if ( !headers_sent() ) @header( sprintf("X-DAViCal-Version: DAViCal/%d.%d.%d; DB/%d.%d.%d", $c->code_major, $c->code_minor, $c->code_patch, $c->schema_major, $c->schema_minor, $c->schema_patch) );
if ( !headers_sent() ) header( "Content-type: ".$content_type ); if ( !headers_sent() ) header( "Content-type: ".$content_type );
if ( !headers_sent() && $c->test_mode ) header( "Request-ID: " . request_id() );
if ( (isset($c->dbg['ALL']) && $c->dbg['ALL']) || (isset($c->dbg['response']) && $c->dbg['response']) if ( (isset($c->dbg['ALL']) && $c->dbg['ALL']) || (isset($c->dbg['response']) && $c->dbg['response'])
|| $status == 400 || $status == 402 || $status == 403 || $status > 404 ) { || $status == 400 || $status == 402 || $status == 403 || $status > 404 ) {

11
inc/always.php.in
View File

@ -161,13 +161,16 @@ $c->template_usr = array( 'active' => true,
$c->hide_TODO = true; // VTODO only visible to collection owner $c->hide_TODO = true; // VTODO only visible to collection owner
$c->readonly_webdav_collections = true; // WebDAV access is readonly $c->readonly_webdav_collections = true; // WebDAV access is readonly
// Kind of private configuration values
$c->total_query_time = 0;
// Any many times GetMoreInstances in inc/RRule.php should loop trying to // Any many times GetMoreInstances in inc/RRule.php should loop trying to
// find more instances. // find more instances.
$c->rrule_loop_limit = 100; $c->rrule_loop_limit = 100;
// Kind of private configuration values
$c->total_query_time = 0;
// Are we in test mode?
$c->test_mode = false;
$c->dbg = array(); $c->dbg = array();
@ -299,7 +302,7 @@ if ( function_exists('awl_set_locale') ) {
* *
*/ */
$c->code_version = 0; $c->code_version = 0;
$c->want_awl_version = 0.64; $c->want_awl_version = 0.65;
$c->version_string = '0.9.9.4'; // The actual version # is replaced into that during the build /release process $c->version_string = '0.9.9.4'; // The actual version # is replaced into that during the build /release process
if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) { if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) {
$c->code_major = $matches[1]; $c->code_major = $matches[1];

4
testing/normalise_result
View File

@ -62,5 +62,9 @@ while( <STDIN> ) {
next; next;
}; };
/^Request-ID: / && do {
$_ = "";
};
print; print;
} }

2
testing/regression-conf.php.example
View File

@ -13,6 +13,8 @@
$c->get_includes_subcollections = true; $c->get_includes_subcollections = true;
// helps with 1036-REPORT-sync-initial-bound // helps with 1036-REPORT-sync-initial-bound
$c->hide_TODO = false; $c->hide_TODO = false;
// enable test mode
$c->test_mode = true;
// for ischedule suite; also needs DKIM set up? // for ischedule suite; also needs DKIM set up?
$c->enable_scheduling = true; $c->enable_scheduling = true;