diff options
| author | Sean Finney <seanius@debian.org> | 2009-06-30 19:11:48 +0200 |
|---|---|---|
| committer | Sean Finney <seanius@debian.org> | 2009-06-30 19:11:48 +0200 |
| commit | d3a8757891280dc6650ca7eead67830c794b0e7b (patch) | |
| tree | fd17e4142019fe7af4eeb7a5c9e0bdade5388418 /sapi | |
| parent | 84f4ca9b07fe5b73d840258f4aa7c1eb534c4253 (diff) | |
| download | php-d3a8757891280dc6650ca7eead67830c794b0e7b.tar.gz | |
Imported Upstream version 5.3.0upstream/5.3.0
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/cgi/cgi_main.c | 4 | ||||
| -rw-r--r-- | sapi/cli/php.1.in | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 54526e31c..04d8cbbd8 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.43 2009/06/17 19:28:52 pajoye Exp $ */ +/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.44 2009/06/22 14:10:40 pajoye Exp $ */ #include "php.h" #include "php_globals.h" @@ -754,7 +754,7 @@ static void php_cgi_ini_activate_user_config(char *path, int path_len, const cha to find more user.ini, if not we only scan the current path. */ if (strncmp(s1, s2, s_len) == 0) { - ptr = s1 + start; /* start is the point where doc_root ends! */ + ptr = s2 + start; /* start is the point where doc_root ends! */ while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) { *ptr = 0; php_parse_user_ini_file(path, PG(user_ini_filename), entry->user_config TSRMLS_CC); diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in index e2d5b9371..52161973d 100644 --- a/sapi/cli/php.1.in +++ b/sapi/cli/php.1.in @@ -1,4 +1,4 @@ -.TH PHP 1 "2008" "The PHP Group" "Scripting Language" +.TH PHP 1 "2009" "The PHP Group" "Scripting Language" .SH NAME .TP 15 php \- PHP Command Line Interface 'CLI' @@ -366,17 +366,12 @@ such a first line as shown below: .PD 1 .P .SH SEE ALSO -For a more or less complete description of PHP look here: +For a description of PHP see: .PD 0 .P .B http://www.php.net/manual/ .PD 1 .P -A nice introduction to PHP by Stig Bakken can be found here: -.PD 0 -.P -.B http://www.zend.com/zend/art/intro.php -.PD 1 .SH BUGS You can view the list of known bugs or report any new bug you found at: |