[PHP-CVS] cvs: php-src /main/streams filter.c php_stream_filter_api.h
wez Wed May 26 17:19:21 2004 EDT
Modified files:
/php-src/main/streams filter.c php_stream_filter_api.h
Log:
Fix silly mistake.
Thanks Antony :)
http://cvs.php.net/diff.php/php-src/main/streams/filter.c?r1=1.11&r2=1.12&ty=u
Index: php-src/main/streams/filter.c
diff -u php-src/main/streams/filter.c:1.11 php-src/main/streams/filter.c:1.12
--- php-src/main/streams/filter.c:1.11 Wed Mar 31 22:52:34 2004
+++ php-src/main/streams/filter.c Wed May 26 17:19:21 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filter.c,v 1.11 2004/04/01 03:52:34 pollita Exp $ */
+/* $Id: filter.c,v 1.12 2004/05/26 21:19:21 wez Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -283,7 +283,7 @@
pefree(filter, filter->is_persistent);
}
-PHPAPI void php_stream_filter_prepend(php_stream_filter_chain *chain,
php_stream_filter *filter TSRMLS_DC)
+PHPAPI void _php_stream_filter_prepend(php_stream_filter_chain *chain,
php_stream_filter *filter TSRMLS_DC)
{
filter->next = chain->head;
filter->prev = NULL;
@@ -297,7 +297,7 @@
filter->chain = chain;
}
-PHPAPI void php_stream_filter_append(php_stream_filter_chain *chain,
php_stream_filter *filter TSRMLS_DC)
+PHPAPI void _php_stream_filter_append(php_stream_filter_chain *chain,
php_stream_filter *filter TSRMLS_DC)
{
php_stream *stream = chain->stream;
http://cvs.php.net/diff.php/php-src/main/streams/php_stream_filter_api.h?r1=1.8&r2=1.9&ty=u
Index: php-src/main/streams/php_stream_filter_api.h
diff -u php-src/main/streams/php_stream_filter_api.h:1.8
php-src/main/streams/php_stream_filter_api.h:1.9
--- php-src/main/streams/php_stream_filter_api.h:1.8Wed Mar 31 18:48:59 2004
+++ php-src/main/streams/php_stream_filter_api.hWed May 26 17:19:21 2004
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: php_stream_filter_api.h,v 1.8 2004/03/31 23:48:59 pollita Exp $ */
+/* $Id: php_stream_filter_api.h,v 1.9 2004/05/26 21:19:21 wez Exp $ */
/* The filter API works on the principle of "Bucket-Brigades". This is
* partially inspired by the Apache 2 method of doing things, although
@@ -129,8 +129,8 @@
END_EXTERN_C()
#define php_stream_filter_alloc(fops, thisptr, persistent)
_php_stream_filter_alloc((fops), (thisptr), (persistent) STREAMS_CC TSRMLS_CC)
#define php_stream_filter_alloc_rel(fops, thisptr, persistent)
_php_stream_filter_alloc((fops), (thisptr), (persistent) STREAMS_REL_CC TSRMLS_CC)
-#define php_stream_fitler_prepend(chain, filter) _php_stream_filter_prepend((chain),
(filter) TSRMLS_CC)
-#define php_stream_fitler_append(chain, filter) _php_stream_filter_append((chain),
(filter) TSRMLS_CC)
+#define php_stream_filter_prepend(chain, filter) _php_stream_filter_prepend((chain),
(filter) TSRMLS_CC)
+#define php_stream_filter_append(chain, filter) _php_stream_filter_append((chain),
(filter) TSRMLS_CC)
#define php_stream_is_filtered(stream) ((stream)->readfilters.head ||
(stream)->writefilters.head)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / run-tests.php
iliaa Wed May 26 14:23:24 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcrun-tests.php Log: MFH: Turn off session.auto_start to prevent test failures. http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.119.2.36&r2=1.119.2.37&ty=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.119.2.36 php-src/run-tests.php:1.119.2.37 --- php-src/run-tests.php:1.119.2.36Fri Apr 30 13:54:45 2004 +++ php-src/run-tests.php Wed May 26 14:23:23 2004 @@ -159,6 +159,7 @@ 'auto_prepend_file=', 'auto_append_file=', 'magic_quotes_runtime=0', + 'session.auto_start=0' ); $info_params = array(); settings2array($ini_overwrites,$info_params); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
iliaa Wed May 26 14:23:21 2004 EDT Modified files: /php-srcrun-tests.php Log: Turn off session.auto_start to prevent test failures. http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.194&r2=1.195&ty=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.194 php-src/run-tests.php:1.195 --- php-src/run-tests.php:1.194 Fri Apr 30 04:18:54 2004 +++ php-src/run-tests.php Wed May 26 14:23:21 2004 @@ -179,6 +179,7 @@ 'auto_append_file=', 'magic_quotes_runtime=0', 'xdebug.default_enable=0', + 'session.auto_start=0' ); $info_params = array(); settings2array($ini_overwrites,$info_params); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/gettext/tests gettext_basic.phpt
iliaa Wed May 26 14:18:19 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/gettext/tests gettext_basic.phpt Log: MFH: Prevent test failure when fi_FI locale is not available. http://cvs.php.net/diff.php/php-src/ext/gettext/tests/gettext_basic.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u Index: php-src/ext/gettext/tests/gettext_basic.phpt diff -u php-src/ext/gettext/tests/gettext_basic.phpt:1.1.2.1 php-src/ext/gettext/tests/gettext_basic.phpt:1.1.2.2 --- php-src/ext/gettext/tests/gettext_basic.phpt:1.1.2.1Tue Sep 23 20:44:23 2003 +++ php-src/ext/gettext/tests/gettext_basic.phptWed May 26 14:18:19 2004 @@ -1,9 +1,16 @@ --TEST-- Gettext basic test --SKIPIF-- - + --FILE-- -http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gettext/tests gettext_basic.phpt
iliaa Wed May 26 14:18:14 2004 EDT Modified files: /php-src/ext/gettext/tests gettext_basic.phpt Log: Prevent test failure when fi_FI locale is not available. http://cvs.php.net/diff.php/php-src/ext/gettext/tests/gettext_basic.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/gettext/tests/gettext_basic.phpt diff -u php-src/ext/gettext/tests/gettext_basic.phpt:1.1 php-src/ext/gettext/tests/gettext_basic.phpt:1.2 --- php-src/ext/gettext/tests/gettext_basic.phpt:1.1Tue Sep 23 06:00:23 2003 +++ php-src/ext/gettext/tests/gettext_basic.phptWed May 26 14:18:14 2004 @@ -1,9 +1,16 @@ --TEST-- Gettext basic test --SKIPIF-- - + --FILE-- -http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/tests bug27582_2.phpt
pajoye Wed May 26 14:12:44 2004 EDT Removed files: /php-src/ext/gd/tests bug27582_2.phpt Log: - Remove this test, it still segfaults anyway (less noise in tests :) ) Already removed in PHP_4_3 branch -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/xslt/tests xslt_backend_info.phpt
iliaa Wed May 26 14:08:32 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/xslt/tests xslt_backend_info.phpt
Log:
Fixed test failure due to incorrect library check.
http://cvs.php.net/diff.php/php-src/ext/xslt/tests/xslt_backend_info.phpt?r1=1.2&r2=1.2.2.1&ty=u
Index: php-src/ext/xslt/tests/xslt_backend_info.phpt
diff -u php-src/ext/xslt/tests/xslt_backend_info.phpt:1.2
php-src/ext/xslt/tests/xslt_backend_info.phpt:1.2.2.1
--- php-src/ext/xslt/tests/xslt_backend_info.phpt:1.2 Sun Nov 10 15:01:55 2002
+++ php-src/ext/xslt/tests/xslt_backend_info.phpt Wed May 26 14:08:32 2004
@@ -22,23 +22,21 @@
* not be available depending on what has been linked into the backend.
*/
-$tmp = explode("\n", xslt_backend_info());
-$info = array();
-foreach($tmp AS $line) {
- list($key, $value) = explode(": ", $line, 2);
- $info[strtolower($key)] = $value;
+$libs = '';
+if (preg_match('!Libs: ([^:]+)i!', xslt_backend_info(), $m)) {
+ $libs = $m[1];
}
-if(FALSE === strstr($info['libs'], " -lexpat")) {
+if(FALSE === strstr($libs, " -lexpat")) {
die("You're configuration is missing expat, which conflicts with sanity.");
}
-if(FALSE === strstr($info['libs'], " -liconv")) {
+if(FALSE === strstr($libs, " -liconv")) {
echo("You don't have iconv support\n");
} else {
echo("You have iconv support\n");
}
-if(FALSE === strstr($info['libs'], " -ljs")) {
+if(FALSE === strstr($libs, " -ljs")) {
echo("You don't have JavaScript support\n");
} else {
echo("You have JavaScript support\n");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
andiWed May 26 14:00:28 2004 EDT Modified files: /php-src/ext/standard basic_functions.c Log: - Use FREE_HASHTABLE instead of efree() http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.667&r2=1.668&ty=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.667 php-src/ext/standard/basic_functions.c:1.668 --- php-src/ext/standard/basic_functions.c:1.667Mon May 24 13:02:12 2004 +++ php-src/ext/standard/basic_functions.c Wed May 26 14:00:27 2004 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.667 2004/05/24 17:02:12 iliaa Exp $ */ +/* $Id: basic_functions.c,v 1.668 2004/05/26 18:00:27 andi Exp $ */ #include "php.h" #include "php_streams.h" @@ -2153,7 +2153,7 @@ zend_hash_apply(BG(user_shutdown_function_names), (apply_func_t) user_shutdown_function_call TSRMLS_CC); memcpy(&EG(bailout), &orig_bailout, sizeof(jmp_buf)); zend_hash_destroy(BG(user_shutdown_function_names)); - efree(BG(user_shutdown_function_names)); + FREE_HASHTABLE(BG(user_shutdown_function_names)); } zend_end_try(); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard proc_open.c
wez Wed May 26 10:55:32 2004 EDT Modified files: /php-src/ext/standard proc_open.c Log: Apparently it is better to specify 500 here for unix98 bits and pieces. http://cvs.php.net/diff.php/php-src/ext/standard/proc_open.c?r1=1.23&r2=1.24&ty=u Index: php-src/ext/standard/proc_open.c diff -u php-src/ext/standard/proc_open.c:1.23 php-src/ext/standard/proc_open.c:1.24 --- php-src/ext/standard/proc_open.c:1.23 Sun May 9 07:08:04 2004 +++ php-src/ext/standard/proc_open.cWed May 26 10:55:32 2004 @@ -15,11 +15,12 @@ | Author: Wez Furlong <[EMAIL PROTECTED]> | +--+ */ -/* $Id: proc_open.c,v 1.23 2004/05/09 11:08:04 stas Exp $ */ +/* $Id: proc_open.c,v 1.24 2004/05/26 14:55:32 wez Exp $ */ -#define _XOPEN_SOURCE +#define _XOPEN_SOURCE 500 #define __EXTENSIONS__ 1 #define _BSD_SOURCE +#define _OSF_SOURCE #include "php.h" #include @@ -52,7 +53,6 @@ * around the alternate code. * */ #ifdef PHP_CAN_SUPPORT_PROC_OPEN - #if HAVE_PTSNAME && HAVE_GRANTPT && HAVE_UNLOCKPT && HAVE_SYS_IOCTL_H && HAVE_TERMIOS_H # include -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mcve config.m4
oops, didn't realize that ... I got an error message with 'phpize' when I tried to use autoconf 2.13, and it said I must use 2.5 ... The reason I added it is someone else did the AC_EGREP_CPP stuff, and it pretty much just hangs on that line without defining $EGREP, and AC_PROG_EGREP is what defines it... Anyhow, is it ok with you if I just add this snippet to the config.m4 file (above the AC_PROG_EGREP call) ... I just ripped it out of the aclocal.m4 that was generated with phpize: # AC_PROG_EGREP # - # This is predefined starting with Autoconf 2.54, so this conditional # definition can be removed once we require Autoconf 2.54 or later. m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], [AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 then ac_cv_prog_egrep='grep -E' else ac_cv_prog_egrep='egrep' fi]) EGREP=$ac_cv_prog_egrep AC_SUBST([EGREP]) ])]) -Brad Wez Furlong wrote: AC_PROG_EGREP is not supported by autoconf 2.13, which is the recommended version to use. Please revert this and solve it some other way, particularly in the 4.3 branch! :-) -Wez. -Original Message- From: Brad House [mailto:[EMAIL PROTECTED] Sent: 25 May 2004 18:09 To: [EMAIL PROTECTED] Subject: [PHP-CVS] cvs: php-src /ext/mcve config.m4 bradmsswTue May 25 13:08:41 2004 EDT Modified files: /php-src/ext/mcve config.m4 Log: PHP_SETUP_OPENSSL is NOT SNMP_SHARED_LIBADD, it's MCVE_SHARED_LIBADD requires AC_PROG_EGREP when you phpize -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mcve config.m4
heh, yours seems so much ... erm ... simpler I'll give it a test and commit it if it works. Thanks! -Brad Wez Furlong wrote: That code might be GPL'd ;-) It looks a bit too magical, so how about a simple: AC_CHECK_PROG(EGREP, egrep, grep -E) AC_SUBST(EGREP) Instead? (please check that it works!) --Wez. -Original Message- From: Brad House [mailto:[EMAIL PROTECTED] Sent: 26 May 2004 13:32 To: Wez Furlong Cc: 'Brad House'; [EMAIL PROTECTED] Subject: Re: [PHP-CVS] cvs: php-src /ext/mcve config.m4 oops, didn't realize that ... I got an error message with 'phpize' when I tried to use autoconf 2.13, and it said I must use 2.5 ... The reason I added it is someone else did the AC_EGREP_CPP stuff, and it pretty much just hangs on that line without defining $EGREP, and AC_PROG_EGREP is what defines it... Anyhow, is it ok with you if I just add this snippet to the config.m4 file (above the AC_PROG_EGREP call) ... I just ripped it out of the aclocal.m4 that was generated with phpize: # AC_PROG_EGREP # - # This is predefined starting with Autoconf 2.54, so this conditional # definition can be removed once we require Autoconf 2.54 or later. m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], [AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 then ac_cv_prog_egrep='grep -E' else ac_cv_prog_egrep='egrep' fi]) EGREP=$ac_cv_prog_egrep AC_SUBST([EGREP]) ])]) -Brad Wez Furlong wrote: AC_PROG_EGREP is not supported by autoconf 2.13, which is the recommended version to use. Please revert this and solve it some other way, particularly in the 4.3 branch! :-) -Wez. -Original Message- From: Brad House [mailto:[EMAIL PROTECTED] Sent: 25 May 2004 18:09 To: [EMAIL PROTECTED] Subject: [PHP-CVS] cvs: php-src /ext/mcve config.m4 bradmsswTue May 25 13:08:41 2004 EDT Modified files: /php-src/ext/mcve config.m4 Log: PHP_SETUP_OPENSSL is NOT SNMP_SHARED_LIBADD, it's MCVE_SHARED_LIBADD requires AC_PROG_EGREP when you phpize -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] cvs: php-src /ext/mcve config.m4
That code might be GPL'd ;-) It looks a bit too magical, so how about a simple: AC_CHECK_PROG(EGREP, egrep, grep -E) AC_SUBST(EGREP) Instead? (please check that it works!) --Wez. > -Original Message- > From: Brad House [mailto:[EMAIL PROTECTED] > Sent: 26 May 2004 13:32 > To: Wez Furlong > Cc: 'Brad House'; [EMAIL PROTECTED] > Subject: Re: [PHP-CVS] cvs: php-src /ext/mcve config.m4 > > oops, didn't realize that ... > I got an error message with 'phpize' when I tried to use > autoconf 2.13, and it said I must use 2.5 ... > > The reason I added it is someone else did the >AC_EGREP_CPP > stuff, and it pretty much just hangs on that line > without defining $EGREP, and AC_PROG_EGREP is what > defines it... > > Anyhow, is it ok with you if I just add this snippet to the > config.m4 file (above the AC_PROG_EGREP call) ... I just > ripped it out of the aclocal.m4 that was generated with phpize: > > # AC_PROG_EGREP > # - > # This is predefined starting with Autoconf 2.54, so this conditional > # definition can be removed once we require Autoconf 2.54 or later. > m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], > [AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], > [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 > then ac_cv_prog_egrep='grep -E' > else ac_cv_prog_egrep='egrep' > fi]) > EGREP=$ac_cv_prog_egrep > AC_SUBST([EGREP]) > ])]) > > > -Brad > > Wez Furlong wrote: > > AC_PROG_EGREP is not supported by autoconf 2.13, which is > the recommended > > version to use. > > Please revert this and solve it some other way, > particularly in the 4.3 > > branch! :-) > > > > -Wez. > > > > > >>-Original Message- > >>From: Brad House [mailto:[EMAIL PROTECTED] > >>Sent: 25 May 2004 18:09 > >>To: [EMAIL PROTECTED] > >>Subject: [PHP-CVS] cvs: php-src /ext/mcve config.m4 > >> > >>bradmsswTue May 25 13:08:41 2004 EDT > >> > >> Modified files: > >>/php-src/ext/mcve config.m4 > >> Log: > >> PHP_SETUP_OPENSSL is NOT SNMP_SHARED_LIBADD, it's > MCVE_SHARED_LIBADD > >> requires AC_PROG_EGREP when you phpize > > > > > > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mcve config.m4
wez Wed May 26 08:29:56 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mcve config.m4 Log: Fix build http://cvs.php.net/diff.php/php-src/ext/mcve/config.m4?r1=1.2.4.7&r2=1.2.4.8&ty=u Index: php-src/ext/mcve/config.m4 diff -u php-src/ext/mcve/config.m4:1.2.4.7 php-src/ext/mcve/config.m4:1.2.4.8 --- php-src/ext/mcve/config.m4:1.2.4.7 Tue May 25 13:05:56 2004 +++ php-src/ext/mcve/config.m4 Wed May 26 08:29:55 2004 @@ -1,7 +1,5 @@ dnl config.m4 for PHP4 MCVE Extension -AC_PROG_EGREP - PHP_ARG_WITH(mcve, for MCVE support, [ --with-mcve[=DIR] Include MCVE support. libmcve >= 3.2.2 or libmonetra >= 4.0 required]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mcve config.m4
wez Wed May 26 06:11:18 2004 EDT Modified files: /php-src/ext/mcve config.m4 Log: Fix build... http://cvs.php.net/diff.php/php-src/ext/mcve/config.m4?r1=1.8&r2=1.9&ty=u Index: php-src/ext/mcve/config.m4 diff -u php-src/ext/mcve/config.m4:1.8 php-src/ext/mcve/config.m4:1.9 --- php-src/ext/mcve/config.m4:1.8 Tue May 25 13:08:41 2004 +++ php-src/ext/mcve/config.m4 Wed May 26 06:11:18 2004 @@ -1,7 +1,5 @@ dnl config.m4 for PHP MCVE Extension -AC_PROG_EGREP - PHP_ARG_WITH(mcve, for MCVE support, [ --with-mcve[=DIR] Include MCVE support. libmcve >= 3.2.2 or libmonetra >= 4.0 required]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] cvs: php-src /ext/mcve config.m4
AC_PROG_EGREP is not supported by autoconf 2.13, which is the recommended version to use. Please revert this and solve it some other way, particularly in the 4.3 branch! :-) -Wez. > -Original Message- > From: Brad House [mailto:[EMAIL PROTECTED] > Sent: 25 May 2004 18:09 > To: [EMAIL PROTECTED] > Subject: [PHP-CVS] cvs: php-src /ext/mcve config.m4 > > bradmssw Tue May 25 13:08:41 2004 EDT > > Modified files: > /php-src/ext/mcve config.m4 > Log: > PHP_SETUP_OPENSSL is NOT SNMP_SHARED_LIBADD, it's MCVE_SHARED_LIBADD > requires AC_PROG_EGREP when you phpize -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
