YunoHost-Apps/z-push_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/z-push_ynh.git synced 2024-09-03 18:05:58 +02:00
Code Issues Activity Actions

Update of php-fpm conf to avoid issues of process being killed to early

Browse source 
Update to latest sources

Update to latest sources
This commit is contained in:
polytan02 2015-08-25 11:03:37 +01:00
parent 8e8f7c87df
commit e030ef003f
4 changed files with 92 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
conf/php-fpm.conf
View file

@ -159,7 +159,7 @@ ping.path = /ping
; does not stop script execution for some reason. A value of '0' means 'off'.
; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
; Default Value: 0
request_terminate_timeout = 120s
request_terminate_timeout = 700s
; The timeout for serving a single request after which a PHP backtrace will be
; dumped to the 'slowlog' file. A value of '0s' means 'off'.
@ -241,3 +241,7 @@ catch_workers_output = yes
php_value[upload_max_filesize] = 50M
php_value[post_max_size] = 50M
php_value[mail.add_x_header] = Off
php_value[max_execution_time] = 600
php_value[max_input_time] = 300
php_value[memory_limit] = 256M

25
sources/backend/imap/mime_calendar.php
View file

@ -158,8 +158,25 @@ function parse_meeting_calendar($part, &$output, $is_sent_folder) {
$uid = $props[0]->Value();
}
if (isset($part->ctype_parameters["method"])) {
switch (strtolower($part->ctype_parameters["method"])) {
$method = false;
$props = $ical->GetPropertiesByPath("VCALENDAR/METHOD");
if (count($props) > 0) {
$method = strtolower($props[0]->Value());
ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendIMAP->parse_meeting_calendar(): Using method from vcalendar object: %s", $method));
}
else {
if (isset($part->ctype_parameters["method"])) {
$method = strtolower($part->ctype_parameters["method"])
ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendIMAP->parse_meeting_calendar(): Using method from mime part object: %s", $method));
}
}
if ($method === false) {
ZLog::Write(LOGLEVEL_WARN, sprintf("BackendIMAP->parse_meeting_calendar() - No method header, please report it to the developers"));
$output->messageclass = "IPM.Appointment";
}
else {
switch ($method) {
case "cancel":
$output->messageclass = "IPM.Schedule.Meeting.Canceled";
$output->meetingrequest->disallownewtimeproposal = 1;
@ -227,10 +244,6 @@ function parse_meeting_calendar($part, &$output, $is_sent_folder) {
break;
}
}
else {
ZLog::Write(LOGLEVEL_WARN, sprintf("BackendIMAP->parse_meeting_calendar() - No method header, please report it to the developers"));
$output->messageclass = "IPM.Appointment";
}
$props = $ical->GetPropertiesByPath('VEVENT/DTSTAMP');
if (count($props) == 1) {

43
sources/testing/samples/meeting_reply_rim.txt Normal file
View file

@ -0,0 +1,43 @@
BEGIN:VCALENDAR
PRODID:-//Research In Motion//RIM App//EN
VERSION:2.0
CALSCALE:GREGORIAN
METHOD:REPLY
BEGIN:VTIMEZONE
TZID:Europe/London
BEGIN:STANDARD
DTSTART:20001029T020000
RRULE:FREQ=YEARLY;BYDAY=4SU;BYMONTH=10
TZNAME:GMT
TZOFFSETFROM:+0100
TZOFFSETTO:+0000
END:STANDARD
BEGIN:DAYLIGHT
DTSTART:20000326T010000
RRULE:FREQ=YEARLY;BYDAY=4SU;BYMONTH=3
TZNAME:BST
TZOFFSETFROM:+0000
TZOFFSETTO:+0100
END:DAYLIGHT
END:VTIMEZONE
BEGIN:VEVENT
ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CN=User1;PARTSTAT=ACCEPTED:mailto:user1
@domain1.tld
COMMENT:ok for me
CREATED:20150823T184526Z
DTEND;TZID=Europe/London:20150823T220000
DTSTAMP:20150823T184527Z
DTSTART;TZID=Europe/London:20150823T210000
ORGANIZER:mailto:user3@domain3.tld
SEQUENCE:0
STATUS:CONFIRMED
SUMMARY:Test of meeting with Z-push
TRANSP:OPAQUE
UID:f503ce50-49c6-11e5-9533-693764eab43f
BEGIN:VALARM
ACTION:DISPLAY
DESCRIPTION:Test of meeting with Z-push in 15 minutes.
TRIGGER;RELATED=START:-PT15M
END:VALARM
END:VEVENT
END:VCALENDAR

25
sources/testing/testing-imap_meeting_method.php Normal file
View file

@ -0,0 +1,25 @@
<?php
require_once 'vendor/autoload.php';
define('LOGLEVEL', LOGLEVEL_DEBUG);
define('LOGUSERLEVEL', LOGLEVEL_DEVICEID);
date_default_timezone_set('Europe/Madrid');
function testing_get_method($filename) {
$body = file_get_contents($filename);
$ical = new iCalComponent();
$ical->ParseFrom($body);
$props = $ical->GetPropertiesByPath("VCALENDAR/METHOD");
if (count($props) > 0) {
printf("METHOD %s\n", $props[0]->Value());
}
}
testing_get_method('testing/samples/meeting_request.txt');
testing_get_method('testing/samples/meeting_request_rim.txt');
testing_get_method('testing/samples/meeting_reply_rim.txt');