lib/ohai/plugins/php.rb in ohai-8.17.1 vs lib/ohai/plugins/php.rb in ohai-8.18.0
- old
+ new
@@ -31,10 +31,10 @@
# Zend Engine v2.5.0, Copyright (c) 1998-2015 Zend Technologies
if so.exitstatus == 0
php = Mash.new
so.stdout.each_line do |line|
case line
- when /PHP (\S+).+built: ([^)]+)/
+ when /^PHP (\S+)(?:.*built: ([^)]+))?/
php[:version] = $1
php[:builddate] = $2
when /Zend Engine v([^\s]+),/
php[:zend_engine_version] = $1
when /Zend OPcache v([^\s]+),/