Skip to content

Accept opts.server value in engine.js #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Markavian wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Accept opts.server value in engine.js #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce3bbbb
Accept opts.server value in engine.js
Markavian Sep 7, 2018
9b30959
Allow additional environment variables to be set using opts.server
johnbeech Sep 7, 2018
0167244
Correctly map keys to environment variables
johnbeech Sep 7, 2018
e77fc19
Fix Undefined Index REQUEST_METHOD and lint file
johnbeech Jun 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/PHPExpress/engine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,18 @@ var engine = function (filePath, opts, callback) {

query = opts.query || querystring.stringify(get),
body = opts.body || querystring.stringify(post),
server = opts.server || {},

env = {
REQUEST_METHOD: method,
CONTENT_LENGTH: body.length,
QUERY_STRING: query
QUERY_STRING: query,
};

Object.keys(server).forEach(key => {
env[key] = server[key]
});

var command = util.format(
'%s %s %s %s',
(body ? util.format('echo "%s" | ', body) : '') + binPath,
Expand Down
7 changes: 5 additions & 2 deletions lib/PHPExpress/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ module.exports = function(req, res) {
res.render(req.path.slice(1), {
method: req.method,
get: req.query,
post: req.body
post: req.body,
server: {
REQUEST_URI: req.url
}
});
};
};
29 changes: 18 additions & 11 deletions page_runner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
<?php
//parse the command line into the $_GET variable
if ( isset($_SERVER) && array_key_exists('QUERY_STRING', $_SERVER) ) {

$REQUEST_METHOD = isset($_SERVER['REQUEST_METHOD'])
? $_SERVER['REQUEST_METHOD'] : 'GET';

$CONTENT_LENGTH = isset($_SERVER['CONTENT_LENGTH'])
? $_SERVER['CONTENT_LENGTH'] : 0;

//parse the command line into the $_GET variable
if (isset($_SERVER) && array_key_exists('QUERY_STRING', $_SERVER) ) {
parse_str($_SERVER['QUERY_STRING'], $_GET);
}
}

//parse the standard input into the $_POST variable
if (($_SERVER['REQUEST_METHOD'] === 'POST')
&& ($_SERVER['CONTENT_LENGTH'] > 0))
{
parse_str(fread(STDIN, $_SERVER['CONTENT_LENGTH']), $_POST);
}
//parse the standard input into the $_POST variable
if (($REQUEST_METHOD === 'POST')
&& ($CONTENT_LENGTH > 0)
) {
parse_str(fread(STDIN, $CONTENT_LENGTH), $_POST);
}

chdir($argv[1]);
require_once $argv[2];
chdir($argv[1]);
require_once $argv[2];