summaryrefslogtreecommitdiff
path: root/lib/util.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-22 14:18:21 -0500
committerEvan Prodromou <evan@status.net>2010-01-22 14:18:21 -0500
commit29d83c8ca94201cb010b5aef564df78ab868ea0c (patch)
tree8bc66e2fc03865e287a4c1907e766d6b4311c832 /lib/util.php
parent104d300799c0817bdbe893f08fd9b46d37a75a80 (diff)
parent0e852def6ae5aa529cca0aef1187152fb5a880be (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index ef8a5d1f0..fb3b8be87 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1130,7 +1130,8 @@ function common_request_id()
$pid = getmypid();
$server = common_config('site', 'server');
if (php_sapi_name() == 'cli') {
- return "$server:$pid";
+ $script = basename($_SERVER['PHP_SELF']);
+ return "$server:$script:$pid";
} else {
static $req_id = null;
if (!isset($req_id)) {