GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Evan Prodromou
2010-01-12 23:25:25 -08:00
parent 392bc728c7 ec145b73fc
commit e34ece8b06
41 changed files with 2618 additions and 1206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/util.php
View File

@@ -1137,8 +1137,9 @@ function common_log_line($priority, $msg)
function common_request_id()
{
$pid = getmypid();
$server = common_config('site', 'server');
if (php_sapi_name() == 'cli') {
return $pid;
return "$server:$pid";
} else {
static $req_id = null;
if (!isset($req_id)) {
@@ -1148,7 +1149,7 @@ function common_request_id()
$url = $_SERVER['REQUEST_URI'];
}
$method = $_SERVER['REQUEST_METHOD'];
return "$pid.$req_id $method $url";
return "$server:$pid.$req_id $method $url";
}
}