Ori.livneh has submitted this change and it was merged.
Change subject: hhvm: fix include_path
......................................................................
hhvm: fix include_path
The include_path PHP setting was incorrectly set under the 'hhvm.'
hierarchy which does not work:
$ grep include_path /etc/hhvm/php.ini
hhvm.include_path = .:/usr/share/php
$ hhvm -a
hphpd> print ini_get('include_path');
print ini_get('include_path');
"."
It needs to be `include_path` and the value enclosed in double quotes
and then:
$ grep include_path /etc/hhvm/php.ini
include_path = ".:/usr/share/php"
$ hhvm -a
hphpd> print ini_get('include_path');
print ini_get('include_path');
".:/usr/share/php"
That fix the PHPUnit tests for TimedMediaHandler MediaWiki extension
which uses include('PEAR.php').
Bug: T78556
Change-Id: I6084f49e97c855286b86dbbd6ce8e80e94069492
---
M modules/hhvm/manifests/init.pp
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 8712a69..5a2d4f8 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -96,13 +96,15 @@
$common_defaults = {
- date => { timezone => 'UTC' },
- hhvm => {
+ date => { timezone => 'UTC' },
+ include_path => '.:/usr/share/php',
+
+ # HHVM specific
+ hhvm => {
dynamic_extension_path =>
'/usr/lib/x86_64-linux-gnu/hhvm/extensions/current',
dynamic_extensions => [ 'fss.so', 'luasandbox.so',
'tidy.so', 'wikidiff2.so' ],
enable_obj_destruct_call => true,
enable_zend_compat => true,
- include_path => '.:/usr/share/php',
pid_file => '', # PID file managed by
start-stop-daemon(8)
resource_limit => { core_file_size => to_bytes('8 Gb') },
log => {
--
To view, visit https://gerrit.wikimedia.org/r/179974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6084f49e97c855286b86dbbd6ce8e80e94069492
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
