extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-16 10:21:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fold Apache error.log and ignored PHP syntax errors, plus remove some warnings

Browse Source
This commit is contained in:
Ralf Becker 2020-03-05 11:53:26 +01:00
parent afacffa69b
commit 7283d33a93
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -72,9 +72,11 @@ script:
# Ubuntu has problems with #!/usr/bin/env php -dapc.enable=1, it stalls forever # Ubuntu has problems with #!/usr/bin/env php -dapc.enable=1, it stalls forever
- vendor/bin/phpunit -c doc -dapc.enable_cli=1 - vendor/bin/phpunit -c doc -dapc.enable_cli=1
# output Apache error.log to diagnose PHP errors in requests send by unit-tests # output Apache error.log to diagnose PHP errors in requests send by unit-tests
- echo "travis_fold:start:SCRIPT folding starts"
- sudo cat /var/log/apache2/error.log - sudo cat /var/log/apache2/error.log
# do not run syntax check for hhvm, as it always fails / get terminated after 10m # do not run syntax check for hhvm, as it always fails / get terminated after 10m
- test $(phpenv version-name) = 'hhvm' || ./doc/php_syntax_check.sh - ./doc/php_syntax_check.sh
- echo "travis_fold:start:SCRIPT folding ends"
cache: cache:
directories: directories:

1
api/src/Session.php
View File

@ -1976,6 +1976,7 @@ class Session
case PHP_SESSION_DISABLED: case PHP_SESSION_DISABLED:
throw new \ErrorException('EGroupware requires PHP session extension!'); throw new \ErrorException('EGroupware requires PHP session extension!');
case PHP_SESSION_NONE: case PHP_SESSION_NONE:
if (headers_sent()) return false; // only gives warnings
ini_set('session.use_cookies',0); // disable the automatic use of cookies, as it uses the path / by default ini_set('session.use_cookies',0); // disable the automatic use of cookies, as it uses the path / by default
session_name(self::EGW_SESSION_NAME); session_name(self::EGW_SESSION_NAME);
if (($sessionid = self::get_sessionid())) if (($sessionid = self::get_sessionid()))

3
api/src/Vfs/Sharing.php
View File

@ -90,9 +90,8 @@ class Sharing extends \EGroupware\Api\Sharing
*/ */
public static function setup_share($keep_session, &$share) public static function setup_share($keep_session, &$share)
{ {
// need to reset fs_tab, as resolve_url does NOT work with just share mounted // need to reset fs_tab, as resolve_url does NOT work with just share mounted
if (count($GLOBALS['egw_info']['server']['vfs_fstab']) <= 1) if (empty($GLOBALS['egw_info']['server']['vfs_fstab']) || count($GLOBALS['egw_info']['server']['vfs_fstab']) <= 1)
{ {
unset($GLOBALS['egw_info']['server']['vfs_fstab']); // triggers reset of fstab in mount() unset($GLOBALS['egw_info']['server']['vfs_fstab']); // triggers reset of fstab in mount()
$GLOBALS['egw_info']['server']['vfs_fstab'] = Vfs::mount(); $GLOBALS['egw_info']['server']['vfs_fstab'] = Vfs::mount();