[PHP-CVS] cvs: php4 / run-tests.php
helly Sat Nov 2 07:44:36 2002 EDT Modified files: /php4 run-tests.php Log: ws Index: php4/run-tests.php diff -u php4/run-tests.php:1.106 php4/run-tests.php:1.107 --- php4/run-tests.php:1.106Sat Nov 2 07:33:24 2002 +++ php4/run-tests.php Sat Nov 2 07:44:36 2002 @@ -13,7 +13,7 @@ | obtain it through the world-wide-web, please send a note to | | [EMAIL PROTECTED] so we can mail you a copy immediately. | +--+ - | Authors: Ilia Alshanetsky [EMAIL PROTECTED] | + | Authors: Ilia Alshanetsky [EMAIL PROTECTED]| | Preston L. Bannister [EMAIL PROTECTED] | | Marcus Boerger [EMAIL PROTECTED] | | Derick Rethans [EMAIL PROTECTED] | -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / EXTENSIONS
moriyoshi Sat Nov 2 07:56:03 2002 EDT Modified files: /php4 EXTENSIONS Log: Added iconv entry Index: php4/EXTENSIONS diff -u php4/EXTENSIONS:1.49 php4/EXTENSIONS:1.50 --- php4/EXTENSIONS:1.49Thu Oct 3 07:40:05 2002 +++ php4/EXTENSIONS Sat Nov 2 07:56:03 2002 @@ -295,9 +295,14 @@ STATUS: Unknown SINCE: 4.0.4 --- -EXTENSION: icap -MAINTENANCE: Unknown -STATUS: Obsolete +extension: icap +maintenance: unknown +status: obsolete +--- +EXTENSION: iconv +PRIMARY MAINTAINER: Moriyoshi Koizumi [EMAIL PROTECTED] +MAINTENANCE: Maintained +STATUS: Working --- EXTENSION: imap PRIMARY MAINTAINER: Chuck Hagenbuch [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / EXTENSIONS
moriyoshi Sat Nov 2 07:58:12 2002 EDT Modified files: /php4 EXTENSIONS Log: Wrong patch. Fixing... Index: php4/EXTENSIONS diff -u php4/EXTENSIONS:1.50 php4/EXTENSIONS:1.51 --- php4/EXTENSIONS:1.50Sat Nov 2 07:56:03 2002 +++ php4/EXTENSIONS Sat Nov 2 07:58:12 2002 @@ -295,9 +295,9 @@ STATUS: Unknown SINCE: 4.0.4 --- -extension: icap -maintenance: unknown -status: obsolete +EXTENSION: icap +MAINTENANCE: Unknown +STATUS: Obsolete --- EXTENSION: iconv PRIMARY MAINTAINER: Moriyoshi Koizumi [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/mbstring mbfilter.c mbregex.c mbstring.c php_mbregex.c
moriyoshi Sat Nov 2 08:38:33 2002 EDT
Modified files:
/php4/ext/mbstring mbfilter.c mbregex.c mbstring.c php_mbregex.c
Log:
Reduced compiler warnings
Index: php4/ext/mbstring/mbfilter.c
diff -u php4/ext/mbstring/mbfilter.c:1.46 php4/ext/mbstring/mbfilter.c:1.47
--- php4/ext/mbstring/mbfilter.c:1.46 Sat Oct 19 22:57:39 2002
+++ php4/ext/mbstring/mbfilter.cSat Nov 2 08:38:32 2002
-79,7 +79,7
*
*/
-/* $Id: mbfilter.c,v 1.46 2002/10/20 02:57:39 fujimoto Exp $ */
+/* $Id: mbfilter.c,v 1.47 2002/11/02 13:38:32 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
-6918,30 +6918,30
case MBFL_OUTPUTFILTER_ILLEGAL_MODE_LONG:
if (c = 0) {
if (c MBFL_WCSGROUP_UCS4MAX) {/* unicode */
- ret = mbfl_convert_filter_strcat(filter, U+
TSRMLS_CC);
+ ret = mbfl_convert_filter_strcat(filter, (const
+unsigned char *)U+ TSRMLS_CC);
} else {
if (c MBFL_WCSGROUP_WCHARMAX) {
m = c ~MBFL_WCSPLANE_MASK;
switch (m) {
case MBFL_WCSPLANE_JIS0208:
- ret =
mbfl_convert_filter_strcat(filter, JIS+ TSRMLS_CC);
+ ret =
+mbfl_convert_filter_strcat(filter, (const unsigned char *)JIS+ TSRMLS_CC);
break;
case MBFL_WCSPLANE_JIS0212:
- ret =
mbfl_convert_filter_strcat(filter, JIS2+ TSRMLS_CC);
+ ret =
+mbfl_convert_filter_strcat(filter, (const unsigned char *)JIS2+ TSRMLS_CC);
break;
case MBFL_WCSPLANE_WINCP932:
- ret =
mbfl_convert_filter_strcat(filter, W932+ TSRMLS_CC);
+ ret =
+mbfl_convert_filter_strcat(filter, (const unsigned char *)W932+ TSRMLS_CC);
break;
case MBFL_WCSPLANE_8859_1:
- ret =
mbfl_convert_filter_strcat(filter, I8859_1+ TSRMLS_CC);
+ ret =
+mbfl_convert_filter_strcat(filter, (const unsigned char *)I8859_1+ TSRMLS_CC);
break;
default:
- ret =
mbfl_convert_filter_strcat(filter, ?+ TSRMLS_CC);
+ ret =
+mbfl_convert_filter_strcat(filter, (const unsigned char *)?+ TSRMLS_CC);
break;
}
c = MBFL_WCSPLANE_MASK;
} else {
- ret = mbfl_convert_filter_strcat(filter,
BAD+ TSRMLS_CC);
+ ret = mbfl_convert_filter_strcat(filter,
+(const unsigned char *)BAD+ TSRMLS_CC);
c = MBFL_WCSGROUP_MASK;
}
}
-7720,7 +7720,7
}
} else if (pc-needle_pos != 0) {
retry:
- h = pc-needle.buffer;
+ h = (int *)pc-needle.buffer;
h++;
for (;;) {
pc-found_pos++;
-9100,7 +9100,7
if (c == 0x3f) {/* ? */
/* identify charset */
mbfl_memory_device_output('\0', pd-tmpdev TSRMLS_CC);
- encoding = mbfl_name2encoding(pd-tmpdev.buffer[pd-cspos]);
+ encoding = mbfl_name2encoding((const char
+*)pd-tmpdev.buffer[pd-cspos]);
if (encoding != NULL) {
pd-incode = encoding-no_encoding;
pd-status = 3;
Index: php4/ext/mbstring/mbregex.c
diff -u php4/ext/mbstring/mbregex.c:1.14 php4/ext/mbstring/mbregex.c:1.15
--- php4/ext/mbstring/mbregex.c:1.14Tue Oct 8 13:20:08 2002
+++ php4/ext/mbstring/mbregex.c Sat Nov 2 08:38:32 2002
-496,7 +496,7
wordbeg,/* Succeeds if at word beginning. */
wordend,/* Succeeds if at word end. */
wordbound, /* Succeeds if at a word boundary. */
-notwordbound,/* Succeeds if not at a word boundary. */
+notwordbound /* Succeeds if not at a word boundary. */
};
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.126
[PHP-CVS] cvs: php4 /sapi/apache2filter README
sas Sat Nov 2 08:47:27 2002 EDT Modified files: /php4/sapi/apache2filterREADME Log: syntax highlighting has been added Index: php4/sapi/apache2filter/README diff -u php4/sapi/apache2filter/README:1.13 php4/sapi/apache2filter/README:1.14 --- php4/sapi/apache2filter/README:1.13 Fri Oct 4 17:22:13 2002 +++ php4/sapi/apache2filter/README Sat Nov 2 08:47:27 2002 -70,4 +70,3 PHP functions like apache_sub_req (see php_functions.c) Protocol handlers Passing script data to engine without temporary file -Syntax Highlighter (relies on files as well) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/xslt sablot.c
msopacuaSat Nov 2 10:01:43 2002 EDT Modified files: /php4/ext/xslt sablot.c Log: - Use spprintf to avoid two calls to zend_get_executed_filename, suggested by Marcus Börger Index: php4/ext/xslt/sablot.c diff -u php4/ext/xslt/sablot.c:1.66 php4/ext/xslt/sablot.c:1.67 --- php4/ext/xslt/sablot.c:1.66 Sat Nov 2 05:58:01 2002 +++ php4/ext/xslt/sablot.c Sat Nov 2 10:01:42 2002 -19,7 +19,7 +--+ */ -/* $Id: sablot.c,v 1.66 2002/11/02 10:58:01 helly Exp $ */ +/* $Id: sablot.c,v 1.67 2002/11/02 15:01:42 msopacua Exp $ */ #ifdef HAVE_CONFIG_H #include config.h -554,8 +554,7 /* Since we have args passed, we need to set the base uri, so pull in executor globals and set the base, using the current filename, specifally for the 'arg' scheme */ - baseuri = (char *)emalloc(strlen(zend_get_executed_filename(TSRMLS_C))+7+1); - sprintf(baseuri, file://%s, zend_get_executed_filename(TSRMLS_C)); + spprintf(baseuri, 0, file://%s, +zend_get_executed_filename(TSRMLS_C)); SablotSetBaseForScheme(XSLT_PROCESSOR(handle), arg, baseuri); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/apache2filter apache_config.c php_apache.h php_functions.c sapi_apache2.c
imajes Sat Nov 2 11:04:28 2002 EDT Modified files: /php4/sapi/apache2filterapache_config.c php_apache.h php_functions.c sapi_apache2.c Log: adding id tags Index: php4/sapi/apache2filter/apache_config.c diff -u php4/sapi/apache2filter/apache_config.c:1.25 php4/sapi/apache2filter/apache_config.c:1.26 --- php4/sapi/apache2filter/apache_config.c:1.25Wed Oct 23 06:11:38 2002 +++ php4/sapi/apache2filter/apache_config.c Sat Nov 2 11:04:26 2002 -16,6 +16,8 +--+ */ +/* $Id: apache_config.c,v 1.26 2002/11/02 16:04:26 imajes Exp $ */ + #include php.h #include php_ini.h #include php_apache.h Index: php4/sapi/apache2filter/php_apache.h diff -u php4/sapi/apache2filter/php_apache.h:1.17 php4/sapi/apache2filter/php_apache.h:1.18 --- php4/sapi/apache2filter/php_apache.h:1.17 Tue Oct 22 08:20:12 2002 +++ php4/sapi/apache2filter/php_apache.hSat Nov 2 11:04:27 2002 -16,6 +16,8 +--+ */ +/* $Id: php_apache.h,v 1.18 2002/11/02 16:04:27 imajes Exp $ */ + #ifndef PHP_APACHE_H #define PHP_APACHE_H Index: php4/sapi/apache2filter/php_functions.c diff -u php4/sapi/apache2filter/php_functions.c:1.30 php4/sapi/apache2filter/php_functions.c:1.31 --- php4/sapi/apache2filter/php_functions.c:1.30Fri Nov 1 23:53:31 2002 +++ php4/sapi/apache2filter/php_functions.c Sat Nov 2 11:04:27 2002 -16,6 +16,8 +--+ */ +/* $Id: php_functions.c,v 1.31 2002/11/02 16:04:27 imajes Exp $ */ + #include php.h #include SAPI.h Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.90 php4/sapi/apache2filter/sapi_apache2.c:1.91 --- php4/sapi/apache2filter/sapi_apache2.c:1.90 Fri Nov 1 23:35:25 2002 +++ php4/sapi/apache2filter/sapi_apache2.c Sat Nov 2 11:04:27 2002 -18,6 +18,8 +--+ */ +/* $Id: sapi_apache2.c,v 1.91 2002/11/02 16:04:27 imajes Exp $ */ + #include fcntl.h #include php.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/xslt/tests xslt_set_scheme_handlers-002.phpt xslt_set_scheme_handlers-003.phpt
msopacuaSat Nov 2 12:24:57 2002 EDT
Modified files:
/php4/ext/xslt/testsxslt_set_scheme_handlers-003.phpt
xslt_set_scheme_handlers-002.phpt
Log:
Skip when Sablotron version is too old
Index: php4/ext/xslt/tests/xslt_set_scheme_handlers-003.phpt
diff -u php4/ext/xslt/tests/xslt_set_scheme_handlers-003.phpt:1.2
php4/ext/xslt/tests/xslt_set_scheme_handlers-003.phpt:1.3
--- php4/ext/xslt/tests/xslt_set_scheme_handlers-003.phpt:1.2 Fri Nov 1 08:43:39
2002
+++ php4/ext/xslt/tests/xslt_set_scheme_handlers-003.phpt Sat Nov 2 12:24:56
+2002
-1,7 +1,12
--TEST--
Core dump when returning FALSE in a handler
--SKIPIF--
-?php include(skipif.inc); ?
+?php
+include(skipif.inc);
+if(!defined(XSLT_SABOPT_FILES_TO_HANDLER)) {
+ die(skip Sablotron CVS 20021031 needed);
+}
+?
--INI--
magic_quotes_runtime=0
--FILE--
Index: php4/ext/xslt/tests/xslt_set_scheme_handlers-002.phpt
diff -u php4/ext/xslt/tests/xslt_set_scheme_handlers-002.phpt:1.1
php4/ext/xslt/tests/xslt_set_scheme_handlers-002.phpt:1.2
--- php4/ext/xslt/tests/xslt_set_scheme_handlers-002.phpt:1.1 Thu Oct 31 21:21:57
2002
+++ php4/ext/xslt/tests/xslt_set_scheme_handlers-002.phpt Sat Nov 2 12:24:56
+2002
-1,7 +1,12
--TEST--
Override Sablotron file handler
--SKIPIF--
-?php include(skipif.inc); ?
+?php
+include(skipif.inc);
+if(!defined(XSLT_SABOPT_FILES_TO_HANDLER)) {
+ die(skip Sab CVS 20021031 needed);
+}
+?
--INI--
magic_quotes_runtime=0
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/standard string.c
I know but in the fopen wrappers I normalize paths to the default slash. I
think all of PHP should behave in the same way.
Andi
At 09:11 AM 11/1/2002 -0500, Ilia A. wrote:
Windows can interpret / as well as \, makes no difference to it. In fact when
we resolve paths on Windows, we already use / and not \.
Ilia
On November 1, 2002 03:01 am, Andi Gutmans wrote:
I'm not sure this is the right thing to do. UNIX and Windows are diffferent
and that's what DEFAULT_SLASH is for.
Andi
At 12:53 AM 11/1/2002 +, Ilia Alshanetsky wrote:
iliaa Thu Oct 31 19:53:28 2002 EDT
Modified files:
/php4/ext/standard string.c
Log:
Fixed bug #18710. dirname() now returns consistent output when dealing
with \ directory separators on Windows.
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.330 php4/ext/standard/string.c:1.331
--- php4/ext/standard/string.c:1.330Wed Oct 30 06:42:51 2002
+++ php4/ext/standard/string.c Thu Oct 31 19:53:27 2002
-18,7 +18,7
+--+
*/
-/* $Id: string.c,v 1.330 2002/10/30 11:42:51 moriyoshi Exp $ */
+/* $Id: string.c,v 1.331 2002/11/01 00:53:27 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
-1148,7 +1148,7
}
if (end path) {
/* The path only contained slashes */
- path[0] = DEFAULT_SLASH;
+ path[0] = '/';
path[1] = '\0';
return;
}
-1169,7 +1169,7
end--;
}
if (end path) {
- path[0] = DEFAULT_SLASH;
+ path[0] = '/';
path[1] = '\0';
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard string.c
iliaa Sat Nov 2 13:54:31 2002 EDT
Modified files:
/php4/ext/standard string.c
Log:
Revert previous dirname() patch.
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.331 php4/ext/standard/string.c:1.332
--- php4/ext/standard/string.c:1.331Thu Oct 31 19:53:27 2002
+++ php4/ext/standard/string.c Sat Nov 2 13:54:31 2002
-18,7 +18,7
+--+
*/
-/* $Id: string.c,v 1.331 2002/11/01 00:53:27 iliaa Exp $ */
+/* $Id: string.c,v 1.332 2002/11/02 18:54:31 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
-1148,7 +1148,7
}
if (end path) {
/* The path only contained slashes */
- path[0] = '/';
+ path[0] = DEFAULT_SLASH;
path[1] = '\0';
return;
}
-1169,7 +1169,7
end--;
}
if (end path) {
- path[0] = '/';
+ path[0] = DEFAULT_SLASH;
path[1] = '\0';
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/standard string.c
Fair enough, I'll revert the patch. We are still left with a problem of pathes
on windows not using / consistently however.
Ilia
On November 2, 2002 01:11 pm, Andi Gutmans wrote:
I know but in the fopen wrappers I normalize paths to the default slash. I
think all of PHP should behave in the same way.
Andi
At 09:11 AM 11/1/2002 -0500, Ilia A. wrote:
Windows can interpret / as well as \, makes no difference to it. In fact
when we resolve paths on Windows, we already use / and not \.
Ilia
On November 1, 2002 03:01 am, Andi Gutmans wrote:
I'm not sure this is the right thing to do. UNIX and Windows are
diffferent and that's what DEFAULT_SLASH is for.
Andi
At 12:53 AM 11/1/2002 +, Ilia Alshanetsky wrote:
iliaa Thu Oct 31 19:53:28 2002 EDT
Modified files:
/php4/ext/standard string.c
Log:
Fixed bug #18710. dirname() now returns consistent output when
dealing with \ directory separators on Windows.
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.330
php4/ext/standard/string.c:1.331 --- php4/ext/standard/string.c:1.330
Wed Oct 30 06:42:51 2002 +++ php4/ext/standard/string.c Thu Oct
31 19:53:27 2002
-18,7 +18,7
+
--+ */
-/* $Id: string.c,v 1.330 2002/10/30 11:42:51 moriyoshi Exp $ */
+/* $Id: string.c,v 1.331 2002/11/01 00:53:27 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
-1148,7 +1148,7
}
if (end path) {
/* The path only contained slashes */
- path[0] = DEFAULT_SLASH;
+ path[0] = '/';
path[1] = '\0';
return;
}
-1169,7 +1169,7
end--;
}
if (end path) {
- path[0] = DEFAULT_SLASH;
+ path[0] = '/';
path[1] = '\0';
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/java README
kalowskySat Nov 2 15:18:09 2002 EDT Modified files: /php4/ext/java README Log: Bug #20148 suggested work around for now. Index: php4/ext/java/README diff -u php4/ext/java/README:1.13 php4/ext/java/README:1.14 --- php4/ext/java/README:1.13 Tue Apr 23 19:30:19 2002 +++ php4/ext/java/READMESat Nov 2 15:18:09 2002 -241,3 +241,7 If all else fails, man dlopen on Unix systems will give more insight on what the system is trying to do internally. + + There have been some issues where users need to create a symbolic link + from java.so to libphp_java.so. If you notice a large number of unexplained + crashes in your webserver log file, try doing this. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / run-tests.php
helly Sat Nov 2 16:48:06 2002 EDT
Modified files:
/php4 run-tests.php
Log:
-allow parameters to be directories
-${dir} - $dir
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.108 php4/run-tests.php:1.109
--- php4/run-tests.php:1.108Sat Nov 2 07:55:06 2002
+++ php4/run-tests.php Sat Nov 2 16:48:05 2002
-139,7 +139,6
// Determine the tests to be run.
-$test_to_run = array();
$test_files = array();
$test_results = array();
$GLOBALS['__PHP_FAILED_TESTS__'] = array();
-148,18 +147,18
if (isset($argc) $argc 1) {
for ($i=1; $i$argc; $i++) {
$testfile = realpath($argv[$i]);
- $test_to_run[$testfile] = 1;
+ if (is_dir($testfile)) {
+ find_files($testfile);
+ } else if(preg_match(/\.phpt$/, $name)) {
+ $test_files[] = $testfile;
+ }
}
// Run selected tests.
- if (count($test_to_run)) {
+ if (count($test_files)) {
echo Running selected tests.\n;
- foreach($test_to_run AS $name=$runnable) {
- if(!preg_match(/\.phpt$/, $name))
- continue;
- if ($runnable) {
- $test_results[$name] = run_test($php,$name);
- }
+ foreach($test_files AS $name) {
+ $test_results[$name] = run_test($php,$name);
}
if(getenv('REPORT_EXIT_STATUS') == 1 and ereg('FAILED( |$)', implode('
', $test_results))) {
exit(1);
-182,7 +181,7
}
foreach ($user_tests as $dir) {
- find_files({$dir}, ($dir == 'ext'));
+ find_files($dir, ($dir == 'ext'));
}
function find_files($dir,$is_ext_dir=FALSE,$ignore=FALSE)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / run-tests.php
helly Sat Nov 2 17:06:04 2002 EDT
Modified files:
/php4 run-tests.php
Log:
copy paste error
#all these different versions here
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.109 php4/run-tests.php:1.110
--- php4/run-tests.php:1.109Sat Nov 2 16:48:05 2002
+++ php4/run-tests.php Sat Nov 2 17:06:03 2002
-149,7 +149,7
$testfile = realpath($argv[$i]);
if (is_dir($testfile)) {
find_files($testfile);
- } else if(preg_match(/\.phpt$/, $name)) {
+ } else if(preg_match(/\.phpt$/, $testfile)) {
$test_files[] = $testfile;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/apache2filter apache_config.c
iliaa Sat Nov 2 18:08:20 2002 EDT
Modified files:
/php4/sapi/apache2filterapache_config.c
Log:
Fixed bug #20217. When php_flag php_value are used, the PHP_INI_PERDIR
flag should be used when setting the ini value. Otherwise, the user cannot
modify per-directory ini settings specified via .htaccess.
Index: php4/sapi/apache2filter/apache_config.c
diff -u php4/sapi/apache2filter/apache_config.c:1.26
php4/sapi/apache2filter/apache_config.c:1.27
--- php4/sapi/apache2filter/apache_config.c:1.26Sat Nov 2 11:04:26 2002
+++ php4/sapi/apache2filter/apache_config.c Sat Nov 2 18:08:20 2002
-16,7 +16,7
+--+
*/
-/* $Id: apache_config.c,v 1.26 2002/11/02 16:04:26 imajes Exp $ */
+/* $Id: apache_config.c,v 1.27 2002/11/02 23:08:20 iliaa Exp $ */
#include php.h
#include php_ini.h
-76,7 +76,7
static const char *php_apache_value_handler(cmd_parms *cmd, void *dummy,
const char *name, const char *value)
{
- return real_value_hnd(cmd, dummy, name, value, PHP_INI_USER);
+ return real_value_hnd(cmd, dummy, name, value, PHP_INI_PERDIR);
}
static const char *php_apache_admin_value_handler(cmd_parms *cmd, void *dummy,
-103,7 +103,7
static const char *php_apache_flag_handler(cmd_parms *cmd, void *dummy,
const char *name, const char *value)
{
- return real_flag_hnd(cmd, dummy, name, value, PHP_INI_USER);
+ return real_flag_hnd(cmd, dummy, name, value, PHP_INI_PERDIR);
}
static const char *php_apache_admin_flag_handler(cmd_parms *cmd, void *dummy,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Sat Nov 2 18:58:03 2002 EDT Modified files: /CVSROOTavail Log: gtkdoc karma for John Starkey Index: CVSROOT/avail diff -u CVSROOT/avail:1.525 CVSROOT/avail:1.526 --- CVSROOT/avail:1.525 Fri Nov 1 18:12:38 2002 +++ CVSROOT/avail Sat Nov 2 18:58:02 2002 -55,7 +55,7 # The PHP-GTK Documentation Group has access to the PHP-GTK # documentation. -avail|jmoore,sfox,pgod,henning,manu,pablo,cortesi,rambik,hirokawa,thomasgm|php-gtk-doc +avail|jmoore,sfox,pgod,henning,manu,pablo,cortesi,rambik,hirokawa,thomasgm,jstarkey|php-gtk-doc # The PHP-GTK Web Group has access to the PHP-GTK website. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
