[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Apr 19 20:35:23 2004 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1603r2=1.1604ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1603 php-src/ChangeLog:1.1604 --- php-src/ChangeLog:1.1603Sun Apr 18 20:34:18 2004 +++ php-src/ChangeLog Mon Apr 19 20:35:22 2004 @@ -1,3 +1,56 @@ +2004-04-19 Rob Richards [EMAIL PROTECTED] + +* scripts/Makefile.frag: + add ext/libxml/ to the headers path + +2004-04-19 Marcus Boerger [EMAIL PROTECTED] + +* ZendEngine2/zend_reflection_api.c: + show ini entries and classes for extensions. + +2004-04-19 Wez Furlong [EMAIL PROTECTED] + +* NEWS + ext/standard/php_fopen_wrapper.c: + Fix #27865; don't dup STDIN, STDOUT or STDERR when running under CLI. + +2004-04-19 Derick Rethans [EMAIL PROTECTED] + +* NEWS: + - Is it really this hard?/jani + +2004-04-19 John Coggeshall [EMAIL PROTECTED] + +* NEWS: + Adding tidy error handling news + +2004-04-19 Wez Furlong [EMAIL PROTECTED] + +* NEWS: + and the news + +* configure.in + ext/standard/proc_open.c: + Add pty support to proc_open() for systems with Unix98 ptys. + +2004-04-19 Edin Kadribasic [EMAIL PROTECTED] + +* ext/interbase/ibase_blobs.c + ext/interbase/ibase_events.c + ext/interbase/php_ibase_includes.h: + No need to export anything. Fixes win32 build + +2004-04-19 Wez Furlong [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS: + news! + +* (PHP_4_3) + main/network.c: + MFH: timeout duration too long in liveness checks for sockets. + Fixes Bug #28055 + 2004-04-18 Ilia Alshanetsky [EMAIL PROTECTED] * ext/posix/posix.c: @@ -2145,7 +2198,7 @@ 2004-03-18 Pierre-Alain Joye [EMAIL PROTECTED] * ext/gd/tests/bug27582_2.phpt: - - Fix the test description and $Id: ChangeLog,v 1.1603 2004/04/19 00:34:18 changelog Exp $ + - Fix the test description and $Id: ChangeLog,v 1.1604 2004/04/20 00:35:22 changelog Exp $ 2004-03-18 Derick Rethans [EMAIL PROTECTED]
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon Apr 19 20:35:30 2004 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.452r2=1.453ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.452 ZendEngine2/ChangeLog:1.453 --- ZendEngine2/ChangeLog:1.452 Sat Apr 17 20:34:17 2004 +++ ZendEngine2/ChangeLog Mon Apr 19 20:35:29 2004 @@ -1,3 +1,8 @@ +2004-04-19 Marcus Boerger [EMAIL PROTECTED] + +* zend_reflection_api.c: + show ini entries and classes for extensions. + 2004-04-17 Marcus Boerger [EMAIL PROTECTED] * zend.c: @@ -4437,7 +4442,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.452 2004/04/18 00:34:17 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.453 2004/04/20 00:35:29 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -6161,7 +6166,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.452 2004/04/18 00:34:17 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.453 2004/04/20 00:35:29 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: non-pecl /simple_cvs simple_cvs.c
shieMon Apr 19 06:35:07 2004 EDT Modified files: /non-pecl/simple_cvssimple_cvs.c Log: fixed: free(NULL) doesn't behave as the manpage says it does http://cvs.php.net/diff.php/non-pecl/simple_cvs/simple_cvs.c?r1=1.1r2=1.2ty=u Index: non-pecl/simple_cvs/simple_cvs.c diff -u non-pecl/simple_cvs/simple_cvs.c:1.1 non-pecl/simple_cvs/simple_cvs.c:1.2 --- non-pecl/simple_cvs/simple_cvs.c:1.1Wed Apr 14 12:42:41 2004 +++ non-pecl/simple_cvs/simple_cvs.cMon Apr 19 06:35:07 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: simple_cvs.c,v 1.1 2004/04/14 16:42:41 shie Exp $ */ +/* $Id: simple_cvs.c,v 1.2 2004/04/19 10:35:07 shie Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -109,6 +109,7 @@ */ static void init_globals(zend_simple_cvs_globals *simple_cvs_globals) { +/*zend_error(E_WARNING,init_globals);*/ simple_cvs_globals-host = NULL; simple_cvs_globals-userName = NULL; simple_cvs_globals-moduleName = NULL; @@ -123,6 +124,7 @@ */ PHP_MINIT_FUNCTION(simple_cvs) { +/*zend_error(E_WARNING,m_init);*/ #ifdef ZTS ZEND_INIT_MODULE_GLOBALS(simple_cvs, NULL, NULL); #endif @@ -155,6 +157,7 @@ */ PHP_MSHUTDOWN_FUNCTION(simple_cvs) { +/*zend_error(E_WARNING,m_shutdown);*/ UNREGISTER_INI_ENTRIES(); return SUCCESS; @@ -166,6 +169,7 @@ */ PHP_RINIT_FUNCTION(simple_cvs) { +/*zend_error(E_WARNING,r_init);*/ init_globals(simple_cvs_globals); return SUCCESS; } @@ -176,11 +180,12 @@ */ PHP_RSHUTDOWN_FUNCTION(simple_cvs) { - efree(GGET(host)); - efree(GGET(userName)); - efree(GGET(moduleName)); - efree(GGET(cvsRoot)); - efree(GGET(workingDir)); +/*zend_error(E_WARNING,r_shutdown);*/ + if (GGET(host)) efree(GGET(host)); + if (GGET(userName)) efree(GGET(userName)); + if (GGET(moduleName)) efree(GGET(moduleName)); + if (GGET(cvsRoot)) efree(GGET(cvsRoot)); + if (GGET(workingDir)) efree(GGET(workingDir)); return SUCCESS; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: non-pecl /simple_cvs simple_cvs.c
On Mon, 19 Apr 2004, Shie Erlich wrote: shie Mon Apr 19 06:35:07 2004 EDT Modified files: /non-pecl/simple_cvs simple_cvs.c Log: fixed: free(NULL) doesn't behave as the manpage says it does free(NULL) (c library function) is a no-op, but efree(NULL) (zend memory alloc thingy) will crash. regards, Derick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: non-pecl /simple_cvs simple_cvs.c
At 12:42 PM 4/19/2004 +0200, Derick Rethans wrote: On Mon, 19 Apr 2004, Shie Erlich wrote: shie Mon Apr 19 06:35:07 2004 EDT Modified files: /non-pecl/simple_cvs simple_cvs.c Log: fixed: free(NULL) doesn't behave as the manpage says it does free(NULL) (c library function) is a no-op, but efree(NULL) (zend memory alloc thingy) will crash. Yeah. I think we shouldn't add that additional if() to efree() and prefer to leave it as-is. Andi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: non-pecl /simple_cvs simple_cvs.c
On Mon, 19 Apr 2004, Andi Gutmans wrote: At 12:42 PM 4/19/2004 +0200, Derick Rethans wrote: On Mon, 19 Apr 2004, Shie Erlich wrote: shie Mon Apr 19 06:35:07 2004 EDT Modified files: /non-pecl/simple_cvs simple_cvs.c Log: fixed: free(NULL) doesn't behave as the manpage says it does free(NULL) (c library function) is a no-op, but efree(NULL) (zend memory alloc thingy) will crash. Yeah. I think we shouldn't add that additional if() to efree() and prefer to leave it as-is. Right, it helps debugging things. Derick -- 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) /main network.c
wez Mon Apr 19 08:43:27 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/main network.c Log: MFH: timeout duration too long in liveness checks for sockets. Fixes Bug #28055 http://cvs.php.net/diff.php/php-src/main/network.c?r1=1.83.2.23r2=1.83.2.24ty=u Index: php-src/main/network.c diff -u php-src/main/network.c:1.83.2.23 php-src/main/network.c:1.83.2.24 --- php-src/main/network.c:1.83.2.23Wed Jan 14 09:54:14 2004 +++ php-src/main/network.c Mon Apr 19 08:43:26 2004 @@ -16,7 +16,7 @@ | Streams work by Wez Furlong [EMAIL PROTECTED] | +--+ */ -/* $Id: network.c,v 1.83.2.23 2004/01/14 14:54:14 wez Exp $ */ +/* $Id: network.c,v 1.83.2.24 2004/04/19 12:43:26 wez Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ @@ -1155,15 +1155,9 @@ int alive = 1; int fd = sock-socket; fd_set rfds; - struct timeval tv; + struct timeval tv = {0, 0}; char buf; - if (sock-timeout.tv_sec == -1) { - tv.tv_sec = FG(default_socket_timeout); - } else { - tv = sock-timeout; - } - /* logic: if the select call indicates that there is data to * be read, but a read returns 0 bytes of data, then the socket * has been closed. -- 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) / NEWS
wez Mon Apr 19 09:37:44 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: news! http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.640r2=1.1247.2.641ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.640 php-src/NEWS:1.1247.2.641 --- php-src/NEWS:1.1247.2.640 Sat Apr 17 19:07:27 2004 +++ php-src/NEWSMon Apr 19 09:37:43 2004 @@ -1,6 +1,8 @@ PHP 4 NEWS ||| ?? ??? 2004, Version 4.3.7 +- Fixed bug #28055 (timeout duration too long in feof()/pfsockopen() liveness + checks). (Wez) - Fixed bug #28042 (greek letters in html to entitity mapping not correct). (Derick) - Fixed bug #27995 (imagefilltoborder() stops the fill process prematurely). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/interbase ibase_blobs.c ibase_events.c php_ibase_includes.h
edink Mon Apr 19 10:13:42 2004 EDT Modified files: /php-src/ext/interbase ibase_blobs.c ibase_events.c php_ibase_includes.h Log: No need to export anything. Fixes win32 build http://cvs.php.net/diff.php/php-src/ext/interbase/ibase_blobs.c?r1=1.6r2=1.7ty=u Index: php-src/ext/interbase/ibase_blobs.c diff -u php-src/ext/interbase/ibase_blobs.c:1.6 php-src/ext/interbase/ibase_blobs.c:1.7 --- php-src/ext/interbase/ibase_blobs.c:1.6 Mon Apr 5 09:22:33 2004 +++ php-src/ext/interbase/ibase_blobs.c Mon Apr 19 10:13:41 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: ibase_blobs.c,v 1.6 2004/04/05 13:22:33 abies Exp $ */ +/* $Id: ibase_blobs.c,v 1.7 2004/04/19 14:13:41 edink Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -55,7 +55,7 @@ } /* }}} */ -PHPAPI int _php_ibase_string_to_quad(char const *id, ISC_QUAD *qd) /* {{{ */ +int _php_ibase_string_to_quad(char const *id, ISC_QUAD *qd) /* {{{ */ { /* shortcut for most common case */ if (sizeof(ISC_QUAD) == sizeof(ISC_UINT64)) { @@ -72,7 +72,7 @@ } /* }}} */ -PHPAPI char *_php_ibase_quad_to_string(ISC_QUAD const qd) /* {{{ */ +char *_php_ibase_quad_to_string(ISC_QUAD const qd) /* {{{ */ { char *result = (char *) emalloc(BLOB_ID_LEN+1); @@ -96,7 +96,7 @@ /* }}} */ } IBASE_BLOBINFO; -PHPAPI int _php_ibase_blob_get(zval *return_value, ibase_blob *ib_blob, unsigned long max_len TSRMLS_DC) /* {{{ */ +int _php_ibase_blob_get(zval *return_value, ibase_blob *ib_blob, unsigned long max_len TSRMLS_DC) /* {{{ */ { if (ib_blob-bl_qd.gds_quad_high || ib_blob-bl_qd.gds_quad_low) { /*not null ?*/ @@ -129,7 +129,7 @@ } /* }}} */ -PHPAPI int _php_ibase_blob_add(zval **string_arg, ibase_blob *ib_blob TSRMLS_DC) /* {{{ */ +int _php_ibase_blob_add(zval **string_arg, ibase_blob *ib_blob TSRMLS_DC) /* {{{ */ { unsigned long put_cnt = 0, rem_cnt; unsigned short chunk_size; http://cvs.php.net/diff.php/php-src/ext/interbase/ibase_events.c?r1=1.6r2=1.7ty=u Index: php-src/ext/interbase/ibase_events.c diff -u php-src/ext/interbase/ibase_events.c:1.6 php-src/ext/interbase/ibase_events.c:1.7 --- php-src/ext/interbase/ibase_events.c:1.6Mon Apr 5 09:22:33 2004 +++ php-src/ext/interbase/ibase_events.cMon Apr 19 10:13:41 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: ibase_events.c,v 1.6 2004/04/05 13:22:33 abies Exp $ */ +/* $Id: ibase_events.c,v 1.7 2004/04/19 14:13:41 edink Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -38,7 +38,7 @@ } /* }}} */ -PHPAPI void _php_ibase_free_event(ibase_event *event TSRMLS_DC) /* {{{ */ +void _php_ibase_free_event(ibase_event *event TSRMLS_DC) /* {{{ */ { unsigned short i; http://cvs.php.net/diff.php/php-src/ext/interbase/php_ibase_includes.h?r1=1.7r2=1.8ty=u Index: php-src/ext/interbase/php_ibase_includes.h diff -u php-src/ext/interbase/php_ibase_includes.h:1.7 php-src/ext/interbase/php_ibase_includes.h:1.8 --- php-src/ext/interbase/php_ibase_includes.h:1.7 Wed Apr 7 06:36:00 2004 +++ php-src/ext/interbase/php_ibase_includes.h Mon Apr 19 10:13:41 2004 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_ibase_includes.h,v 1.7 2004/04/07 10:36:00 abies Exp $ */ +/* $Id: php_ibase_includes.h,v 1.8 2004/04/19 14:13:41 edink Exp $ */ #ifndef PHP_IBASE_INCLUDES_H #define PHP_IBASE_INCLUDES_H @@ -191,8 +191,8 @@ typedef void (*info_func_t)(char*); #endif -PHPAPI void _php_ibase_error(TSRMLS_D); -PHPAPI void _php_ibase_module_error(char * TSRMLS_DC, ...) +void _php_ibase_error(TSRMLS_D); +void _php_ibase_module_error(char * TSRMLS_DC, ...) PHP_ATTRIBUTE_FORMAT(printf,1,PHP_ATTR_FMT_OFFSET +2); /* determine if a resource is a link or transaction handle */ @@ -205,8 +205,8 @@ if (SUCCESS != _php_ibase_def_trans(lh, th TSRMLS_CC)) { RETURN_FALSE; } \ } while (0) -PHPAPI int _php_ibase_def_trans(ibase_db_link *ib_link, ibase_trans **trans TSRMLS_DC); -PHPAPI void _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAMETERS, zval **link_id, +int _php_ibase_def_trans(ibase_db_link *ib_link, ibase_trans **trans TSRMLS_DC); +void _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAMETERS, zval **link_id, ibase_db_link **ib_link, ibase_trans **trans); /* provided by ibase_query.c */ @@ -214,14 +214,14 @@ /* provided by ibase_blobs.c */ void php_ibase_blobs_minit(INIT_FUNC_ARGS); -PHPAPI int _php_ibase_string_to_quad(char const *id, ISC_QUAD *qd); -PHPAPI char *_php_ibase_quad_to_string(ISC_QUAD const qd); -PHPAPI int _php_ibase_blob_get(zval *return_value, ibase_blob *ib_blob, unsigned long max_len TSRMLS_DC); -PHPAPI int _php_ibase_blob_add(zval **string_arg, ibase_blob *ib_blob TSRMLS_DC); +int
[PHP-CVS] cvs: php-src / configure.in /ext/standard proc_open.c
wez Mon Apr 19 11:07:30 2004 EDT Modified files: /php-srcconfigure.in /php-src/ext/standard proc_open.c Log: Add pty support to proc_open() for systems with Unix98 ptys. # With permission from Andi http://cvs.php.net/diff.php/php-src/configure.in?r1=1.502r2=1.503ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.502 php-src/configure.in:1.503 --- php-src/configure.in:1.502 Wed Apr 14 07:24:16 2004 +++ php-src/configure.inMon Apr 19 11:07:30 2004 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.502 2004/04/14 11:24:16 andi Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.503 2004/04/19 15:07:30 wez Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -351,6 +351,7 @@ string.h \ syslog.h \ sysexits.h \ +sys/ioctl.h \ sys/file.h \ sys/mman.h \ sys/mount.h \ @@ -364,6 +365,7 @@ sys/sysexits.h \ sys/varargs.h \ sys/wait.h \ +termios.h \ unistd.h \ unix.h \ utime.h \ @@ -479,6 +481,7 @@ getrusage \ gettimeofday \ gmtime_r \ +grantpt \ inet_ntoa \ inet_ntop \ inet_pton \ @@ -494,6 +497,7 @@ nl_langinfo \ perror \ poll \ +ptsname \ putenv \ realpath \ random \ @@ -504,6 +508,7 @@ setitimer \ setlocale \ localeconv \ +setpgid \ setsockopt \ setvbuf \ shutdown \ @@ -524,6 +529,7 @@ symlink \ tempnam \ tzset \ +unlockpt \ unsetenv \ usleep \ nanosleep \ http://cvs.php.net/diff.php/php-src/ext/standard/proc_open.c?r1=1.20r2=1.21ty=u Index: php-src/ext/standard/proc_open.c diff -u php-src/ext/standard/proc_open.c:1.20 php-src/ext/standard/proc_open.c:1.21 --- php-src/ext/standard/proc_open.c:1.20 Thu Jan 8 03:17:33 2004 +++ php-src/ext/standard/proc_open.cMon Apr 19 11:07:30 2004 @@ -15,10 +15,13 @@ | Author: Wez Furlong [EMAIL PROTECTED] | +--+ */ -/* $Id: proc_open.c,v 1.20 2004/01/08 08:17:33 andi Exp $ */ +/* $Id: proc_open.c,v 1.21 2004/04/19 15:07:30 wez Exp $ */ + +#define _XOPEN_SOURCE +#define _BSD_SOURCE -#include stdio.h #include php.h +#include stdio.h #include ctype.h #include php_string.h #include safe_mode.h @@ -35,9 +38,6 @@ #include signal.h #endif -#if HAVE_SYS_TYPES_H -#include sys/types.h -#endif #if HAVE_SYS_STAT_H #include sys/stat.h #endif @@ -52,6 +52,13 @@ * */ #ifdef PHP_CAN_SUPPORT_PROC_OPEN + +#if HAVE_PTSNAME HAVE_GRANTPT HAVE_UNLOCKPT HAVE_SYS_IOCTL_H HAVE_TERMIOS_H +# define PHP_CAN_DO_PTS1 +# include sys/ioctl.h +# include termios.h +#endif + #include proc_open.h static int le_proc_open; @@ -472,6 +479,10 @@ struct php_process_handle *proc; int is_persistent = 0; /* TODO: ensure that persistent procs will work */ int suppress_errors = 0; +#if PHP_CAN_DO_PTS + php_file_descriptor_t dev_ptmx = -1;/* master */ + php_file_descriptor_t slave_pty = -1; +#endif if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, saz|s!a!a!, command, command_len, descriptorspec, pipes, cwd, cwd_len, environment, @@ -640,7 +651,32 @@ #else descriptors[ndesc].childend = fd; #endif - + } else if (strcmp(Z_STRVAL_PP(ztype), pty) == 0) { +#if PHP_CAN_DO_PTS + if (dev_ptmx == -1) { + /* open things up */ + dev_ptmx = open(/dev/ptmx, O_RDWR); + if (dev_ptmx == -1) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, failed to open /dev/ptmx, errno %d, errno); + goto exit_fail; + } + grantpt(dev_ptmx); + unlockpt(dev_ptmx); + slave_pty = open(ptsname(dev_ptmx), O_RDWR); + + if (slave_pty == -1) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, failed to open slave pty, errno %d, errno); + goto exit_fail; + } + } + descriptors[ndesc].mode = DESC_PIPE; + descriptors[ndesc].childend = dup(slave_pty); + descriptors[ndesc].parentend = dup(dev_ptmx); + descriptors[ndesc].mode_flags = O_RDWR; +#else + php_error_docref(NULL TSRMLS_CC, E_WARNING, pty pseudo terminal is not support on this system); + goto exit_fail; +#endif } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, %s
[PHP-CVS] cvs: php-src / NEWS
wez Mon Apr 19 11:08:11 2004 EDT Modified files: /php-srcNEWS Log: and the news http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1679r2=1.1680ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1679 php-src/NEWS:1.1680 --- php-src/NEWS:1.1679 Thu Apr 15 08:25:57 2004 +++ php-src/NEWSMon Apr 19 11:08:11 2004 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? ? 2004, PHP 5 Release Candidate 2 +- Add pty support to proc_open(). (Wez) - Reimplemented zend.ze1_compatibility_mode to have better PHP 4 compliance. (Dmitry, Andi) - Added possibility to check in which extension an internal class was defined -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
johnMon Apr 19 11:14:31 2004 EDT Modified files: /php-srcNEWS Log: Adding tidy error handling news http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1680r2=1.1681ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1680 php-src/NEWS:1.1681 --- php-src/NEWS:1.1680 Mon Apr 19 11:08:11 2004 +++ php-src/NEWSMon Apr 19 11:14:31 2004 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? ? 2004, PHP 5 Release Candidate 2 +- Changed tidy error handling to no longer use exceptions (John) - Add pty support to proc_open(). (Wez) - Reimplemented zend.ze1_compatibility_mode to have better PHP 4 compliance. (Dmitry, Andi) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
derick Mon Apr 19 11:15:49 2004 EDT Modified files: /php-srcNEWS Log: - Is it really this hard?/jani http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1681r2=1.1682ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1681 php-src/NEWS:1.1682 --- php-src/NEWS:1.1681 Mon Apr 19 11:14:31 2004 +++ php-src/NEWSMon Apr 19 11:15:49 2004 @@ -1,12 +1,12 @@ PHPNEWS ||| ?? ? 2004, PHP 5 Release Candidate 2 -- Changed tidy error handling to no longer use exceptions (John) -- Add pty support to proc_open(). (Wez) - Reimplemented zend.ze1_compatibility_mode to have better PHP 4 compliance. (Dmitry, Andi) +- Added pty support to proc_open(). (Wez) - Added possibility to check in which extension an internal class was defined in using reflection API. (Marcus) +- Changed tidy error handling to no longer use exceptions. (John) - Changed class and method names to use studlyCaps convention. (Marcus) - Changed language parser to throw errors when a non-empty signature is used in a destructor definition. (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: non-pecl /simple_cvs php_simple_cvs.h simple_cvs.c
shieMon Apr 19 11:50:18 2004 EDT Modified files: /non-pecl/simple_cvssimple_cvs.c php_simple_cvs.h Log: fixed: some function names had uppercase letters. this dies, since zend_hash_del_key doesn't lower the uppercase before searching http://cvs.php.net/diff.php/non-pecl/simple_cvs/simple_cvs.c?r1=1.2r2=1.3ty=u Index: non-pecl/simple_cvs/simple_cvs.c diff -u non-pecl/simple_cvs/simple_cvs.c:1.2 non-pecl/simple_cvs/simple_cvs.c:1.3 --- non-pecl/simple_cvs/simple_cvs.c:1.2Mon Apr 19 06:35:07 2004 +++ non-pecl/simple_cvs/simple_cvs.cMon Apr 19 11:50:18 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: simple_cvs.c,v 1.2 2004/04/19 10:35:07 shie Exp $ */ +/* $Id: simple_cvs.c,v 1.3 2004/04/19 15:50:18 shie Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -44,24 +44,25 @@ function_entry simple_cvs_functions[] = { PHP_FE(scvs_checkout, NULL) PHP_FE(scvs_update, NULL) - PHP_FE(scvs_login, NULL) + PHP_FE(scvs_login, NULL) PHP_FE(scvs_status, NULL) PHP_FE(scvs_commit, NULL) - PHP_FE(scvs_diff, NULL) - PHP_FE(scvs_get_host, NULL) - PHP_FE(scvs_get_authMethod, NULL) - PHP_FE(scvs_get_compressionLevel, NULL) - PHP_FE(scvs_get_username, NULL) + PHP_FE(scvs_diff, NULL) + PHP_FE(scvs_get_host, NULL) + PHP_FE(scvs_get_module_name,NULL) PHP_FE(scvs_get_cvsroot,NULL) - PHP_FE(scvs_get_moduleName, NULL) - PHP_FE(scvs_get_workingDir, NULL) + PHP_FE(scvs_get_compression_level, NULL) + PHP_FE(scvs_get_username, NULL) + PHP_FE(scvs_get_auth_method, NULL) + PHP_FE(scvs_get_working_dir, NULL) + PHP_FE(scvs_set_compression_level, NULL) PHP_FE(scvs_set_host, NULL) - PHP_FE(scvs_set_authMethod, NULL) - PHP_FE(scvs_set_compressionLevel, NULL) + PHP_FE(scvs_set_auth_method,NULL) PHP_FE(scvs_set_username, NULL) PHP_FE(scvs_set_cvsroot,NULL) - PHP_FE(scvs_set_moduleName, NULL) - PHP_FE(scvs_set_workingDir, NULL) + PHP_FE(scvs_set_module_name,NULL) + PHP_FE(scvs_set_working_dir, NULL) + PHP_FE(scvs_set_cvsroot,NULL) {NULL, NULL, NULL} /* Must be the last line in simple_cvs_functions[] */ }; /* }}} */ @@ -109,7 +110,6 @@ */ static void init_globals(zend_simple_cvs_globals *simple_cvs_globals) { -/*zend_error(E_WARNING,init_globals);*/ simple_cvs_globals-host = NULL; simple_cvs_globals-userName = NULL; simple_cvs_globals-moduleName = NULL; @@ -124,7 +124,6 @@ */ PHP_MINIT_FUNCTION(simple_cvs) { -/*zend_error(E_WARNING,m_init);*/ #ifdef ZTS ZEND_INIT_MODULE_GLOBALS(simple_cvs, NULL, NULL); #endif @@ -148,7 +147,6 @@ REGISTER_LONG_CONSTANT(SCVS_STAT_UPDATED, SCVS_STAT_UPDATED, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(SCVS_STAT_PATCHED, SCVS_STAT_PATCHED, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(SCVS_STAT_NOTINCVS, SCVS_STAT_NOTINCVS, CONST_CS | CONST_PERSISTENT); - return SUCCESS; } /* }}} */ @@ -157,7 +155,6 @@ */ PHP_MSHUTDOWN_FUNCTION(simple_cvs) { -/*zend_error(E_WARNING,m_shutdown);*/ UNREGISTER_INI_ENTRIES(); return SUCCESS; @@ -169,7 +166,6 @@ */ PHP_RINIT_FUNCTION(simple_cvs) { -/*zend_error(E_WARNING,r_init);*/ init_globals(simple_cvs_globals); return SUCCESS; } @@ -180,13 +176,12 @@ */ PHP_RSHUTDOWN_FUNCTION(simple_cvs) { -/*zend_error(E_WARNING,r_shutdown);*/ if (GGET(host)) efree(GGET(host)); if (GGET(userName)) efree(GGET(userName)); if (GGET(moduleName)) efree(GGET(moduleName)); if (GGET(cvsRoot)) efree(GGET(cvsRoot)); if (GGET(workingDir)) efree(GGET(workingDir)); - + return SUCCESS; } /* }}} */ @@ -231,23 +226,21 @@ if (GGET(host) != NULL) efree(GGET(host)); GGET(host) = estrndup(hn, hn_len); /* might be an extra \0 hiding inside */ - /*zend_printf(got new hostname: %s\n, cvs_id.host);*/ - RETURN_BOOL(1); } /* }}} */ -/* {{{ proto string scvs_get_authMethod() +/* {{{ proto string scvs_get_auth_method() Return the authentication method (SCVS_AUTH_PSERVER or SCVS_AUTH_EXT) */ -PHP_FUNCTION(scvs_get_authMethod) +PHP_FUNCTION(scvs_get_auth_method) { RETURN_LONG(GGET(authMethod)); } /* }}} */ -/* {{{ proto Boolean scvs_set_authMethod(int method) +/* {{{ proto Boolean scvs_set_auth_method(int method) Sets the authentication method (0 is pserver, 1 is ext) */ -PHP_FUNCTION(scvs_set_authMethod) +PHP_FUNCTION(scvs_set_auth_method) { long am; @@ -266,17 +259,17 @@ /* }}} */ -/* {{{ proto
[PHP-CVS] cvs: non-pecl /simple_cvs config.m4
shieMon Apr 19 11:50:50 2004 EDT Modified files: /non-pecl/simple_cvsconfig.m4 Log: allow the module to be compiled as .so http://cvs.php.net/diff.php/non-pecl/simple_cvs/config.m4?r1=1.1r2=1.2ty=u Index: non-pecl/simple_cvs/config.m4 diff -u non-pecl/simple_cvs/config.m4:1.1 non-pecl/simple_cvs/config.m4:1.2 --- non-pecl/simple_cvs/config.m4:1.1 Wed Apr 14 12:42:41 2004 +++ non-pecl/simple_cvs/config.m4 Mon Apr 19 11:50:50 2004 @@ -1,63 +1,11 @@ -dnl $Id: config.m4,v 1.1 2004/04/14 16:42:41 shie Exp $ -dnl config.m4 for extension simple_cvs +dnl +dnl $Id: config.m4,v 1.2 2004/04/19 15:50:50 shie Exp $ +dnl -dnl Comments in this file start with the string 'dnl'. -dnl Remove where necessary. This file will not work -dnl without editing. - -dnl If your extension references something external, use with: - -dnl PHP_ARG_WITH(simple_cvs, for simple_cvs support, -dnl Make sure that the comment is aligned: -dnl [ --with-simple_cvs Include simple_cvs support]) - -dnl Otherwise use enable: - -dnl PHP_ARG_ENABLE(simple_cvs, whether to enable simple_cvs support, -dnl Make sure that the comment is aligned: -dnl [ --enable-simple_cvs Enable simple_cvs support]) +PHP_ARG_WITH(simple_cvs,for simple_cvs support, +[ --with-simple_cvs[=DIR] Include simple_cvs support.]) if test $PHP_SIMPLE_CVS != no; then - dnl Write more examples of tests here... - - dnl # --with-simple_cvs - check with-path - dnl SEARCH_PATH=/usr/local /usr # you might want to change this - dnl SEARCH_FOR=/include/simple_cvs.h # you most likely want to change this - dnl if test -r $PHP_SIMPLE_CVS/$SEARCH_FOR; then # path given as parameter - dnl SIMPLE_CVS_DIR=$PHP_SIMPLE_CVS - dnl else # search default path list - dnl AC_MSG_CHECKING([for simple_cvs files in default path]) - dnl for i in $SEARCH_PATH ; do - dnl if test -r $i/$SEARCH_FOR; then - dnl SIMPLE_CVS_DIR=$i - dnl AC_MSG_RESULT(found in $i) - dnl fi - dnl done - dnl fi - dnl - dnl if test -z $SIMPLE_CVS_DIR; then - dnl AC_MSG_RESULT([not found]) - dnl AC_MSG_ERROR([Please reinstall the simple_cvs distribution]) - dnl fi - - dnl # --with-simple_cvs - add include path - dnl PHP_ADD_INCLUDE($SIMPLE_CVS_DIR/include) - - dnl # --with-simple_cvs - check for lib and symbol presence - dnl LIBNAME=simple_cvs # you may want to change this - dnl LIBSYMBOL=simple_cvs # you most likely want to change this - - dnl PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, - dnl [ - dnl PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SIMPLE_CVS_DIR/lib, SIMPLE_CVS_SHARED_LIBADD) - dnl AC_DEFINE(HAVE_SIMPLE_CVSLIB,1,[ ]) - dnl ],[ - dnl AC_MSG_ERROR([wrong simple_cvs lib version or lib not found]) - dnl ],[ - dnl -L$SIMPLE_CVS_DIR/lib -lm -ldl - dnl ]) - dnl - dnl PHP_SUBST(SIMPLE_CVS_SHARED_LIBADD) - PHP_NEW_EXTENSION(simple_cvs, simple_cvs.c simple_cvs_utils.c, $ext_shared) + fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/standard php_fopen_wrapper.c
wez Mon Apr 19 13:41:39 2004 EDT Modified files: /php-srcNEWS /php-src/ext/standard php_fopen_wrapper.c Log: Fix #27865; don't dup STDIN, STDOUT or STDERR when running under CLI. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1682r2=1.1683ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1682 php-src/NEWS:1.1683 --- php-src/NEWS:1.1682 Mon Apr 19 11:15:49 2004 +++ php-src/NEWSMon Apr 19 13:41:38 2004 @@ -16,6 +16,7 @@ (Dmitry) - Fixed bug #27997 (SPL: Crash with getInnerIterator()). (Marcus) - Fixed bug #27928 (sqlite incorrectly handles invalid filenames). (Ilia) +- Fixed bug #27865 (STDIN, STDOUT, STDERR are dup()d under CLI). (Wez) - Fixed bug #27821 (xml_parse() segfaults when xml_set_object() is called from class method). (Andi, Rob) - Fixed bug #27742 (WDSL SOAP Parsing Schema bug). (Dmitry) http://cvs.php.net/diff.php/php-src/ext/standard/php_fopen_wrapper.c?r1=1.43r2=1.44ty=u Index: php-src/ext/standard/php_fopen_wrapper.c diff -u php-src/ext/standard/php_fopen_wrapper.c:1.43 php-src/ext/standard/php_fopen_wrapper.c:1.44 --- php-src/ext/standard/php_fopen_wrapper.c:1.43 Thu Jan 8 03:17:33 2004 +++ php-src/ext/standard/php_fopen_wrapper.cMon Apr 19 13:41:39 2004 @@ -17,7 +17,7 @@ | Hartmut Holzgraefe [EMAIL PROTECTED] | +--+ */ -/* $Id: php_fopen_wrapper.c,v 1.43 2004/01/08 08:17:33 andi Exp $ */ +/* $Id: php_fopen_wrapper.c,v 1.44 2004/04/19 17:41:39 wez Exp $ */ #include stdio.h #include stdlib.h @@ -166,11 +166,11 @@ } if (!strcasecmp(path, stdin)) { - fd = dup(STDIN_FILENO); + fd = !strcmp(sapi_module.name, cli) ? STDIN_FILENO : dup(STDIN_FILENO); } else if (!strcasecmp(path, stdout)) { - fd = dup(STDOUT_FILENO); + fd = !strcmp(sapi_module.name, cli) ? STDOUT_FILENO : dup(STDOUT_FILENO); } else if (!strcasecmp(path, stderr)) { - fd = dup(STDERR_FILENO); + fd = !strcmp(sapi_module.name, cli) ? STDERR_FILENO : dup(STDERR_FILENO); } else if (!strncasecmp(path, filter/, 7)) { /* Save time/memory when chain isn't specified */ if (strchr(mode, 'r') || strchr(mode, '+')) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /scripts Makefile.frag
rrichards Mon Apr 19 15:46:00 2004 EDT Modified files: /php-src/scriptsMakefile.frag Log: add ext/libxml/ to the headers path http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.9r2=1.10ty=u Index: php-src/scripts/Makefile.frag diff -u php-src/scripts/Makefile.frag:1.9 php-src/scripts/Makefile.frag:1.10 --- php-src/scripts/Makefile.frag:1.9 Mon Dec 1 10:17:13 2003 +++ php-src/scripts/Makefile.frag Mon Apr 19 15:46:00 2004 @@ -29,6 +29,7 @@ main/ \ main/streams/ \ regex/ \ + ext/libxml/ \ ext/standard/ \ ext/session/ \ ext/xml/ \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes interface_construct.phpt interface_optional_arg.phpt
helly Mon Apr 19 20:00:52 2004 EDT Added files: /php-src/tests/classes interface_construct.phpt interface_optional_arg.phpt Log: Add new tests (by magnus) http://cvs.php.net/co.php/php-src/tests/classes/interface_construct.phpt?r=1.1p=1 Index: php-src/tests/classes/interface_construct.phpt +++ php-src/tests/classes/interface_construct.phpt --TEST-- ZE2 An interface constructor signature must not be inherited --SKIPIF-- ?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2 needed'); ? --FILE-- ?php error_reporting(4095); interface test { public function __construct($foo); } class foo implements test { public function __construct() { echo foo\n; } } $foo = new foo; ? --EXPECT-- foo http://cvs.php.net/co.php/php-src/tests/classes/interface_optional_arg.phpt?r=1.1p=1 Index: php-src/tests/classes/interface_optional_arg.phpt +++ php-src/tests/classes/interface_optional_arg.phpt --TEST-- ZE2 An interface method allows additional default arguments --SKIPIF-- ?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2 needed'); ? --FILE-- ?php error_reporting(4095); interface test { public function bar(); } class foo implements test { public function bar($foo = NULL) { echo foo\n; } } $foo = new foo; $foo-bar(); ? --EXPECT-- foo -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tidy tidy.c
iliaa Mon Apr 19 20:26:49 2004 EDT Modified files: /php-src/ext/tidy tidy.c Log: Fixed compiler warnings. http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.47r2=1.48ty=u Index: php-src/ext/tidy/tidy.c diff -u php-src/ext/tidy/tidy.c:1.47 php-src/ext/tidy/tidy.c:1.48 --- php-src/ext/tidy/tidy.c:1.47Sun Apr 18 03:58:18 2004 +++ php-src/ext/tidy/tidy.c Mon Apr 19 20:26:48 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: tidy.c,v 1.47 2004/04/18 07:58:18 john Exp $ */ +/* $Id: tidy.c,v 1.48 2004/04/20 00:26:48 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -343,7 +343,7 @@ if(TG(inst)) { zend_throw_exception(tidy_ce_exception, msg, 0 TSRMLS_CC); } else { -php_error_docref(NULL TSRMLS_CC, E_WARNING, msg); +php_error_docref(NULL TSRMLS_CC, E_WARNING, %s, msg); } va_end(ap); @@ -952,7 +952,7 @@ php_info_print_table_start(); php_info_print_table_header(2, Tidy support, enabled); php_info_print_table_row(2, libTidy Release, (char *)tidyReleaseDate()); - php_info_print_table_row(2, Extension Version, PHP_TIDY_MODULE_VERSION ($Id: tidy.c,v 1.47 2004/04/18 07:58:18 john Exp $)); + php_info_print_table_row(2, Extension Version, PHP_TIDY_MODULE_VERSION ($Id: tidy.c,v 1.48 2004/04/20 00:26:48 iliaa Exp $)); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); @@ -987,7 +987,7 @@ if (input_len 1) { if (tidyParseString(doc, input) 0 || tidyCleanAndRepair(doc) 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, errbuf.bp); + php_error_docref(NULL TSRMLS_CC, E_WARNING, %s, errbuf.bp); RETVAL_NULL(); } else { TidyBuffer output = {0}; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php