You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2018/05/10 20:57:11 UTC
[4/4] vcl git commit: Merge branch 'develop' into VCL-1087_VCL_CAS_SSO
Merge branch 'develop' into VCL-1087_VCL_CAS_SSO
Project: http://git-wip-us.apache.org/repos/asf/vcl/repo
Commit: http://git-wip-us.apache.org/repos/asf/vcl/commit/66a788aa
Tree: http://git-wip-us.apache.org/repos/asf/vcl/tree/66a788aa
Diff: http://git-wip-us.apache.org/repos/asf/vcl/diff/66a788aa
Branch: refs/heads/VCL-1087_VCL_CAS_SSO
Commit: 66a788aaccfd326a308ae77377e177ad4a5a0295
Parents: 9e9361f 10ea259
Author: Josh Thompson <jf...@ncsu.edu>
Authored: Thu May 10 16:55:42 2018 -0400
Committer: Josh Thompson <jf...@ncsu.edu>
Committed: Thu May 10 16:55:42 2018 -0400
----------------------------------------------------------------------
web/.ht-inc/requests.php | 69 ++++++++++++++++++++++---------------------
web/.ht-inc/utils.php | 37 ++++++++++++-----------
2 files changed, 56 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vcl/blob/66a788aa/web/.ht-inc/utils.php
----------------------------------------------------------------------
diff --cc web/.ht-inc/utils.php
index 8daa29f,7c98834..4461ab9
--- a/web/.ht-inc/utils.php
+++ b/web/.ht-inc/utils.php
@@@ -13025,13 -13022,13 +13028,13 @@@ function json_encode($a=false)
if($a === true)
return 'true';
if(is_scalar($a)) {
- if (is_float($a)) {
- // Always use "." for floats.
- return floatval(str_replace(",", ".", strval($a)));
+ if(is_float($a)) {
- // Always use "." for floats.
- return floatval(str_replace(",", ".", strval($a)));
++ // Always use "." for floats.
++ return floatval(str_replace(",", ".", strval($a)));
}
- if (is_string($a)) {
- static $jsonReplaces = array(array("\\", "/", "\n", "\t", "\r", "\b", "\f", '"'), array('\\\\', '\\/', '\\n', '\\t', '\\r', '\\b', '\\f', '\"'));
+ if(is_string($a)) {
- static $jsonReplaces = array(array("\\", "/", "\n", "\t", "\r", "\b", "\f", '"'), array('\\\\', '\\/', '\\n', '\\t', '\\r', '\\b', '\\f', '\"'));
++ static $jsonReplaces = array(array("\\", "/", "\n", "\t", "\r", "\b", "\f", '"'), array('\\\\', '\\/', '\\n', '\\t', '\\r', '\\b', '\\f', '\"'));
return '"' . str_replace($jsonReplaces[0], $jsonReplaces[1], $a) . '"';
}
else