Disabled pcre.jit as it is always running out of memory. Added optional XFServerPort conf.ini directive to specify the server port when using development server.

Author: shannah

Dataface/Application.php

@@ -558,10 +558,10 @@ function __construct($conf = null) {
 		}
 		$this->_baseUrl  = $_SERVER['PHP_SELF'];
 		if ( !is_array($conf) ) $conf = array();
-                $configPath = DATAFACE_SITE_PATH.'/conf.ini.php';
-                if (!is_readable($configPath)) {
-                    $configPath = DATAFACE_SITE_PATH.'/conf.ini';
-                }
+        $configPath = DATAFACE_SITE_PATH.'/conf.ini.php';
+        if (!is_readable($configPath)) {
+            $configPath = DATAFACE_SITE_PATH.'/conf.ini';
+        }
 		if ( is_readable($configPath) ){
 			$conf = array_merge(parse_ini_file($configPath, true), $conf);
 			if ( @$conf['__include__'] ){

init.php

@@ -20,7 +20,7 @@
  */
 
 function init($site_path, $dataface_url){
-    
+	ini_set('pcre.jit', '0');
         $originalUrl = isset($_SERVER['HTTP_X_ORIGINAL_URL']) ? parse_url($_SERVER['HTTP_X_ORIGINAL_URL']) : null;
         if ($originalUrl) {
             $host = @$originalUrl["host"];

scaffold_template/bin/print_config_var.php

@@ -1,19 +1,52 @@
 <?php
+error_reporting(E_ALL);
+ini_set('display_errors', 'on');
 if (!@$argv) {
     fwrite(STDERR, "CLI ONLY");
     exit(1);
 }
+$XATAFACE_CONFIG_PATHS = array();
 
-$files = array('conf.ini', 'conf.ini.php', 'conf.db.ini', 'conf.db.ini.php');
+$cliConfPath = dirname(__FILE__) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'etc' . DIRECTORY_SEPARATOR . 'cli-conf.ini';
+
+if (is_readable($cliConfPath)) {
+	$cliConf = parse_ini_file($cliConfPath, true);
+	if (isset($cliConf['XATAFACE_CONFIG_PATHS'])) {
+		$paths = explode(":", $cliConf['XATAFACE_CONFIG_PATHS']);
+		foreach ($paths as $path) {
+			if (!trim($path)) {
+				continue;
+			}
+			$XATAFACE_CONFIG_PATHS[] = dirname($cliConfPath).DIRECTORY_SEPARATOR.$path;
+		}
+	}
+}
+$XATAFACE_CONFIG_PATHS[] = dirname(__FILE__). DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'app';
+$files = array('conf.ini.php', 'conf.ini');
 $conf = array();
 foreach ($files as $file) {
-    $file_path = dirname(__FILE__) 
-        . DIRECTORY_SEPARATOR . '..' 
-        . DIRECTORY_SEPARATOR . 'app' 
-        . DIRECTORY_SEPARATOR . $file;
-    if (file_exists($file_path)) {
-        $conf = array_merge_recursive($conf, parse_ini_file($file_path, true));
-    }
+	foreach ($XATAFACE_CONFIG_PATHS as $path) {
+	    $file_path = $path . DIRECTORY_SEPARATOR . $file;
+	    if (file_exists($file_path)) {
+			$tmp = parse_ini_file($file_path, true);
+			if ( @$tmp['__include__'] ){
+				$includes = array_map('trim',explode(',', $tmp['__include__']));
+				foreach ($includes as $i){
+					if (!trim($i)) {
+						continue;
+					}
+	                $p = dirname($file_path) . DIRECTORY_SEPARATOR . $i;             
+					if ( is_readable($p) ){
+						$tmp = array_merge($tmp, parse_ini_file($p, true));
+					} else if ( is_readable($p.'.php') ){
+						$tmp = array_merge($tmp, parse_ini_file($p.'.php', true));
+					}
+				}
+			}
+	        $conf = array_merge_recursive($tmp, $conf);
+	    }
+	}
+    
 }
 if (count($argv) < 2) {
     print_r($conf);
@@ -30,7 +63,12 @@
             echo dirname(dirname(realpath(__FILE__)));
             exit;
         case 'XFServerPort':
-            echo '9090';
+			if (@$conf['XFServerPort']) {
+				echo $conf['XFServerPort'];
+			} else {
+				echo '9090';
+			}
+            
             exit;
         case 'XFShortVersionString':
             $version_path = dirname(__FILE__)