diff options
| author | David Soria Parra <dsp@php.net> | 2012-03-31 09:34:25 +0200 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2012-03-31 09:34:25 +0200 |
| commit | 3bf53aa911e1e2128a11aee45c126000635de006 (patch) | |
| tree | bdfee9a7d1b79c03903ed8000d5a33595d546960 /main | |
| parent | aa774a51d5c45b98103e0f67914d4c0b152e80ae (diff) | |
| parent | ff8be9845f14a8156e7551033c2e98dad459f6fd (diff) | |
| download | php-git-3bf53aa911e1e2128a11aee45c126000635de006.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Cleanup Safe Mode related comment in SG(request_info)
Diffstat (limited to 'main')
| -rw-r--r-- | main/SAPI.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/main/SAPI.h b/main/SAPI.h index f868f852e7..8f2536b84f 100644 --- a/main/SAPI.h +++ b/main/SAPI.h @@ -105,7 +105,6 @@ typedef struct { /* this is necessary for the CGI SAPI module */ char *argv0; - /* this is necessary for Safe Mode */ char *current_user; int current_user_length; |