[PHP-CVS-DAILY] cvs: php4 / ChangeLog
changelog Fri Sep 27 20:33:09 2002 EDT Modified files: /php4 ChangeLog Log: ChangeLog update Index: php4/ChangeLog diff -u php4/ChangeLog:1.1174 php4/ChangeLog:1.1175 --- php4/ChangeLog:1.1174 Thu Sep 26 20:33:43 2002 +++ php4/ChangeLog Fri Sep 27 20:33:08 2002 @@ -1,3 +1,95 @@ +2002-09-27 Wez Furlong [EMAIL PROTECTED] + +* ext/standard/basic_functions.c + ext/standard/file.c + ext/standard/file.h: +Implement stream_select() which works just like socket_select, but only on +streams. + +* ext/ncurses/ncurses.c + ext/ncurses/ncurses_fe.c + ext/ncurses/ncurses_functions.c + ext/ncurses/php_ncurses.h + ext/ncurses/php_ncurses_fe.h: More ncurses functions and constants. + +* ext/ncurses/config.m4 + ext/ncurses/ncurses.c + ext/ncurses/ncurses_fe.c + ext/ncurses/ncurses_functions.c + ext/ncurses/php_ncurses.h + ext/ncurses/php_ncurses_fe.h: +Implement some more window routines, add pad functions. +Add panel functions when libpanel is also detected. +Register STDSCR constant during ncurses_init(). + +2002-09-27 Colin Viebrock [EMAIL PROTECTED] + +* ext/standard/info.c: fix formating by breaking on to separate lines + +2002-09-27 Edin Kadribasic [EMAIL PROTECTED] + +* ext/gd/gd.dsp + ext/gd/gd_bundled.dsp: (Edin) +Fixed bug #19595 (Missing functions for GD2 format handling). + +2002-09-27 Jani Taskinen [EMAIL PROTECTED] + +* ext/standard/dir.c: ws + +2002-09-27 Hartmut Holzgraefe [EMAIL PROTECTED] + +* ext/standard/dir.c: /tmp/cvsmLUuXQ + +2002-09-27 Edin Kadribasic [EMAIL PROTECTED] + +* ext/standard/credits_ext.h + ext/standard/credits_sapi.h: Update credits. + +* sapi/cli/CREDITS: Those two have enough credits already :) + +2002-09-27 Tal Peer [EMAIL PROTECTED] + +* ext/fribidi/CREDITS: - Fixed case in extension name + +2002-09-27 Jani Taskinen [EMAIL PROTECTED] + +* NEWS: style polizei + +2002-09-27 Yasuo Ohgaki [EMAIL PROTECTED] + +* ext/standard/dir.c: No need to define GLOB_NOMATCH. + +2002-09-27 Derick Rethans [EMAIL PROTECTED] + +* ext/ldap/config.m4: +- Fix for bug #19633 (wrong directories in ext/ldap/config.m4). +- Fix for bug #19633 (wrong directories in ext/ldap/config.m4). + +2002-09-27 Wez Furlong [EMAIL PROTECTED] + +* ext/sysvsem/sysvsem.c: +Really *really* fix the segfault bug #17274 and bug #19627 this time. + +2002-09-27 Jan Lehnardt [EMAIL PROTECTED] + +* ext/standard/info.c: - be more conservative ;) + +2002-09-27 Wez Furlong [EMAIL PROTECTED] + +* NEWS: And a couple more. + +* NEWS: Add some bug #'s to make Markus happier :-) + +* EXTENSIONS: Typo + +2002-09-27 Markus Fischer [EMAIL PROTECTED] + +* NEWS: - Update. + +2002-09-27 Dan Kalowsky [EMAIL PROTECTED] + +* EXTENSIONS: They seem to be working... + 2002-09-26 Colin Viebrock [EMAIL PROTECTED] * NEWS: document changes
[PHP-CVS] cvs: php4 / NEWS
mfischerFri Sep 27 03:02:12 2002 EDT Modified files: /php4 NEWS Log: - Update. Index: php4/NEWS diff -u php4/NEWS:1.1140 php4/NEWS:1.1141 --- php4/NEWS:1.1140Thu Sep 26 16:54:55 2002 +++ php4/NEWS Fri Sep 27 03:02:12 2002 -1,6 +1,9 PHP 4 NEWS ||| ? ? ??? 2002, Version 4.3.0 +- Fixed bug #11643 (Session related, fix SID redefinition). (Ilia) +- Fixed bug #18556 (Scripting Engine, problem with locales like tr_TR). + (Ilia) - Changed y2k_compliance to default to 1 now. (Sascha) - Added platform independent socket error constants for better error handling. - Fixed include(), require() and GD functions to work with remote files under -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / EXTENSIONS
wez Fri Sep 27 05:03:44 2002 EDT Modified files: /php4 EXTENSIONS Log: Typo Index: php4/EXTENSIONS diff -u php4/EXTENSIONS:1.47 php4/EXTENSIONS:1.48 --- php4/EXTENSIONS:1.47Thu Sep 26 22:09:35 2002 +++ php4/EXTENSIONS Fri Sep 27 05:03:44 2002 @@ -464,7 +464,7 @@ --- EXTENSION: xslt PRIMARY MAINTAINER: Hartmut Holzgraefe [EMAIL PROTECTED] -MAINTENANC: Odd Fixes +MAINTENANCE: Odd Fixes STATUS: Working (mostly) --- EXTENSION: yaz -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
wez Fri Sep 27 05:21:04 2002 EDT Modified files: /php4 NEWS Log: Add some bug #'s to make Markus happier :-) Index: php4/NEWS diff -u php4/NEWS:1.1141 php4/NEWS:1.1142 --- php4/NEWS:1.1141Fri Sep 27 03:02:12 2002 +++ php4/NEWS Fri Sep 27 05:21:04 2002 -1,6 +1,12 PHP 4 NEWS ||| ? ? ??? 2002, Version 4.3.0 +- Added mb_convert_case() function to the mbstring extension which can convert + strings between upper, lower and title case using Unicode mappings. + Fixed bug #19257 (strtolower strtoupper does not work for UTF-8 strings). + (Wez). +- Fixed bug #18521 (htmlentities did not warn about unsupported charsets). + (Wez) - Fixed bug #11643 (Session related, fix SID redefinition). (Ilia) - Fixed bug #18556 (Scripting Engine, problem with locales like tr_TR). (Ilia) -12,7 +18,7 proper HTML escaping, and make it XHTML compliant. (Colin) - Added php.ini option auto_detect_line_endings which enables PHP to detect Macintosh, Unix and Dos end-of-line characters in fgets() and file(). - Fixes Bug #16521. (Wez) + Fixes bugs #16521 and #16708. (Wez) - Fixed compile errors in the FriBidi extension (Bug #16414). (Tal) - Fixed bugs #7472, #12120 and #12989 as well as other potential problems with strip_tags() function. (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/sysvsem sysvsem.c
wez Fri Sep 27 06:24:55 2002 EDT
Modified files:
/php4/ext/sysvsem sysvsem.c
Log:
Really *really* fix the segfault bug #17274 and bug #19627 this time.
- Fixed bugs #17274 and #19627 (segfault in sem_remove). (Wez)
Index: php4/ext/sysvsem/sysvsem.c
diff -u php4/ext/sysvsem/sysvsem.c:1.40 php4/ext/sysvsem/sysvsem.c:1.41
--- php4/ext/sysvsem/sysvsem.c:1.40 Fri May 17 08:33:49 2002
+++ php4/ext/sysvsem/sysvsem.c Fri Sep 27 06:24:54 2002
-17,7 +17,7
+--+
*/
-/* $Id: sysvsem.c,v 1.40 2002/05/17 12:33:49 wez Exp $ */
+/* $Id: sysvsem.c,v 1.41 2002/09/27 10:24:54 wez Exp $ */
/* Latest update build anc tested on Linux 2.2.14
*
-114,6 +114,7
*/
if(sem_ptr-count == -1 || !sem_ptr-auto_release) {
+ efree(sem_ptr);
return;
}
/* Decrement the usage count. */
-272,10 +273,7
sem_ptr-count = 0;
sem_ptr-auto_release = auto_release;
- Z_LVAL_P(return_value) = zend_list_insert(sem_ptr, php_sysvsem_module.le_sem);
- Z_TYPE_P(return_value) = IS_LONG;
-
- sem_ptr-id = (int)Z_LVAL_P(return_value);
+ sem_ptr-id = ZEND_REGISTER_RESOURCE(return_value, sem_ptr,
+php_sysvsem_module.le_sem);
}
/* }}} */
-284,7 +282,6
static void php_sysvsem_semop(INTERNAL_FUNCTION_PARAMETERS, int acquire)
{
pval **arg_id;
- int id, type;
sysvsem_sem *sem_ptr;
struct sembuf sop;
-293,22 +290,16
if (zend_get_parameters_ex(1, arg_id)==FAILURE) {
RETURN_FALSE;
}
- convert_to_long_ex(arg_id);
- id = (int)Z_LVAL_PP(arg_id);
break;
default:
WRONG_PARAM_COUNT;
break;
}
- sem_ptr = (sysvsem_sem *) zend_list_find(id, type);
- if (type!=php_sysvsem_module.le_sem) {
- php_error(E_WARNING, %d is not a SysV semaphore index, id);
- RETURN_FALSE;
- }
+ ZEND_FETCH_RESOURCE(sem_ptr, sysvsem_sem *, arg_id, -1, SysV semphore,
+php_sysvsem_module.le_sem);
if (!acquire sem_ptr-count == 0) {
- php_error(E_WARNING, SysV semaphore index %d (key 0x%x) is not
currently acquired, id, sem_ptr-key);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, SysV semaphore %d (key
+0x%x) is not currently acquired, Z_LVAL_PP(arg_id), sem_ptr-key);
RETURN_FALSE;
}
-356,7 +347,6
PHP_FUNCTION(sem_remove)
{
pval **arg_id;
- int id,type;
sysvsem_sem *sem_ptr;
#if HAVE_SEMUN
union semun un;
-366,33 +356,25
if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, arg_id) == FAILURE) {
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(arg_id);
-
- id = Z_LVAL_PP(arg_id);
- sem_ptr = (sysvsem_sem *) zend_list_find(id, type);
-
- if (type!=php_sysvsem_module.le_sem) {
- php_error(E_WARNING, %d is not a SysV semaphore index, id);
- RETURN_FALSE;
- }
+ ZEND_FETCH_RESOURCE(sem_ptr, sysvsem_sem *, arg_id, -1, SysV semphore,
+php_sysvsem_module.le_sem);
#if HAVE_SEMUN
un.buf = buf;
- if(semctl(sem_ptr-semid, 0, IPC_STAT, un) 0) {
+ if(semctl(sem_ptr-semid, 0, IPC_STAT, un) 0) {
#else
if(semctl(sem_ptr-semid, 0, IPC_STAT, NULL) 0) {
#endif
- php_error(E_WARNING, %d is not a existing SysV Semaphore Id, id);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, SysV semphore %d does not
+(any longer) exist, Z_LVAL_PP(arg_id));
RETURN_FALSE;
}
#if HAVE_SEMUN
- if(semctl(sem_ptr-semid, 0, IPC_RMID, un) 0) {
+ if(semctl(sem_ptr-semid, 0, IPC_RMID, un) 0) {
#else
if(semctl(sem_ptr-semid, 0, IPC_RMID, NULL) 0) {
#endif
- php_error(E_WARNING, sem_remove() failed for id %d: %s, id,
strerror(errno));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, failed for SysV sempphore
+%d: %s, Z_LVAL_PP(arg_id), strerror(errno));
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard dir.c
yohgaki Fri Sep 27 07:44:42 2002 EDT
Modified files:
/php4/ext/standard dir.c
Log:
No need to define GLOB_NOMATCH.
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.102 php4/ext/standard/dir.c:1.103
--- php4/ext/standard/dir.c:1.102 Thu Sep 26 07:19:26 2002
+++ php4/ext/standard/dir.c Fri Sep 27 07:44:42 2002
-16,7 +16,7
+--+
*/
-/* $Id: dir.c,v 1.102 2002/09/26 11:19:26 jan Exp $ */
+/* $Id: dir.c,v 1.103 2002/09/27 11:44:42 yohgaki Exp $ */
/* {{{ includes/startup/misc */
-134,7 +134,6
REGISTER_LONG_CONSTANT(GLOB_MARK, GLOB_MARK, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(GLOB_NOSORT, GLOB_NOSORT, CONST_CS |
CONST_PERSISTENT);
#ifdef PHP_WIN32
- REGISTER_LONG_CONSTANT(GLOB_NOMATCH, GLOB_NOMATCH, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(GLOB_NOESCAPE, GLOB_NOESCAPE, CONST_CS |
CONST_PERSISTENT);
#endif
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
sniper Fri Sep 27 07:52:38 2002 EDT Modified files: /php4 NEWS Log: style polizei Index: php4/NEWS diff -u php4/NEWS:1.1143 php4/NEWS:1.1144 --- php4/NEWS:1.1143Fri Sep 27 05:26:39 2002 +++ php4/NEWS Fri Sep 27 07:52:38 2002 -7,16 +7,13 strings between upper, lower and title case using Unicode mappings. Fixed bug #19257 (strtolower strtoupper does not work for UTF-8 strings). (Wez) -- Fixed bug #18521 (htmlentities did not warn about unsupported charsets). - (Wez) +- Fixed bug #18521 (htmlentities didn't warn about unsupported charsets). (Wez) - Fixed bug #11643 (Session related, fix SID redefinition). (Ilia) -- Fixed bug #18556 (Scripting Engine, problem with locales like tr_TR). - (Ilia) +- Fixed bug #18556 (Scripting Engine, problem with locales like tr_TR). (Ilia) - Changed y2k_compliance to default to 1 now. (Sascha) - Added platform independent socket error constants for better error handling. - Fixed include(), require() and GD functions to work with remote files under - win32. - Fixed bug #18609 (ImageCreateFromJPEG can't fetch from a URL. (Wez) + win32. Fixed bug #18609 (ImageCreateFromJPEG can't fetch from a URL. (Wez) - Update output of phpinfo() to use more CSS to reduce the file size, do proper HTML escaping, and make it XHTML compliant. (Colin) - Added php.ini option auto_detect_line_endings which enables PHP to detect -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/cli CREDITS
edink Fri Sep 27 08:15:13 2002 EDT Modified files: /php4/sapi/cli CREDITS Log: Those two have enough credits already :) Index: php4/sapi/cli/CREDITS diff -u php4/sapi/cli/CREDITS:1.2 php4/sapi/cli/CREDITS:1.3 --- php4/sapi/cli/CREDITS:1.2 Mon Mar 11 11:25:32 2002 +++ php4/sapi/cli/CREDITS Fri Sep 27 08:15:13 2002 -1,2 +1,2 CLI -Rasmus Lerdorf, Stig Bakken, Edin Kadribasic, Marcus Boerger +Edin Kadribasic, Marcus Boerger -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard credits_ext.h credits_sapi.h
edink Fri Sep 27 08:23:49 2002 EDT Modified files: /php4/ext/standard credits_ext.h credits_sapi.h Log: Update credits. # Updated by scripts/credits. For some reason it put Java and Win32 COM # twice. I removed the duplicates manually. Index: php4/ext/standard/credits_ext.h diff -u php4/ext/standard/credits_ext.h:1.12 php4/ext/standard/credits_ext.h:1.13 --- php4/ext/standard/credits_ext.h:1.12Wed Jun 26 14:58:25 2002 +++ php4/ext/standard/credits_ext.h Fri Sep 27 08:23:49 2002 -26,13 +26,13 CREDIT_LINE(dBase, Jim Winstead); CREDIT_LINE(DBM, Rasmus Lerdorf, Jim Winstead); CREDIT_LINE(dbx (database abstraction), Marc Boeren, Rui Hirokawa, Frank M. Kromann); -CREDIT_LINE(domxml, Uwe Steinmann); +CREDIT_LINE(domxml, Uwe Steinmann, Christian Stocker); CREDIT_LINE(dotnet, Sam Ruby); CREDIT_LINE(EXIF, Rasmus Lerdorf, Marcus Boerger); CREDIT_LINE(FBSQL, Frank M. Kromann); CREDIT_LINE(FDF, Uwe Steinmann); CREDIT_LINE(FilePro, Chad Robinson); -CREDIT_LINE(FRIBIDI, Onn Ben-Zvi); +CREDIT_LINE(FriBidi, Onn Ben-Zvi, Tal Peer); CREDIT_LINE(FTP, Andrew Skalski); CREDIT_LINE(GD imaging, Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto); CREDIT_LINE(GetText, Alex Plotnick); -58,7 +58,7 CREDIT_LINE(mSQL, Zeev Suraski); CREDIT_LINE(MS SQL, Frank M. Kromann); CREDIT_LINE(Multibyte (Japanese) String Functions, Tsukada Takuya, Rui Hirokawa); -CREDIT_LINE(MySQL, Zeev Suraski); +CREDIT_LINE(MySQL, Zeev Suraski, Zak Greant, Georg Richter); CREDIT_LINE(ncurses, Hartmut Holzgraefe); CREDIT_LINE(OCI8, Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson); CREDIT_LINE(ODBC, Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel R. Kalowsky); -74,8 +74,6 CREDIT_LINE(qtdom, Jan Borsodi); CREDIT_LINE(Readline, Thies C. Arntzen); CREDIT_LINE(Recode, Kristian Köhntopp); -CREDIT_LINE(rpc abstraction, Harald Radi); -CREDIT_LINE(Satellite (CORBA), David Eriksson); CREDIT_LINE(Sessions, Sascha Schumann, Andrei Zmievski); CREDIT_LINE(Shared Memory Operations, Slava Poliakov, Ilia Alshanetsky); CREDIT_LINE(SNMP, Rasmus Lerdorf); -89,7 +87,6 CREDIT_LINE(tokenizer, Andrei Zmievski); CREDIT_LINE(User-space object overloading, Andrei Zmievski); CREDIT_LINE(Verisign Payflow Pro, John Donagher, David Croft); -CREDIT_LINE(Vpopmail, David Croft, Boian Bonev); CREDIT_LINE(W32API, James Moore); CREDIT_LINE(WDDX, Andrei Zmievski); CREDIT_LINE(Win32 COM, Alan Brown, Wez Furlong, Harald Radi, Zeev Suraski); Index: php4/ext/standard/credits_sapi.h diff -u php4/ext/standard/credits_sapi.h:1.8 php4/ext/standard/credits_sapi.h:1.9 --- php4/ext/standard/credits_sapi.h:1.8Wed Jun 26 14:58:49 2002 +++ php4/ext/standard/credits_sapi.hFri Sep 27 08:23:49 2002 -16,7 +16,7 CREDIT_LINE(Apache 2.0, Sascha Schumann, Aaron Bannert); CREDIT_LINE(Caudium / Roxen, David Hedbor); CREDIT_LINE(CGI, Rasmus Lerdorf, Stig Bakken); -CREDIT_LINE(CLI, Rasmus Lerdorf, Stig Bakken, Edin Kadribasic, Marcus Boerger); +CREDIT_LINE(CLI, Edin Kadribasic, Marcus Boerger); CREDIT_LINE(fastcgi, Ben Mansell); CREDIT_LINE(fhttpd, Alex Belits); CREDIT_LINE(ISAPI, Andi Gutmans, Zeev Suraski); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard dir.c
hholzgraFri Sep 27 08:40:31 2002 EDT
Modified files:
/php4/ext/standard dir.c
Log:
/tmp/cvsmLUuXQ
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.103 php4/ext/standard/dir.c:1.104
--- php4/ext/standard/dir.c:1.103 Fri Sep 27 07:44:42 2002
+++ php4/ext/standard/dir.c Fri Sep 27 08:40:31 2002
-16,7 +16,7
+--+
*/
-/* $Id: dir.c,v 1.103 2002/09/27 11:44:42 yohgaki Exp $ */
+/* $Id: dir.c,v 1.104 2002/09/27 12:40:31 hholzgra Exp $ */
/* {{{ includes/startup/misc */
-131,9 +131,16
REGISTER_STRING_CONSTANT(DIRECTORY_SEPARATOR, tmpstr,
CONST_CS|CONST_PERSISTENT);
#ifdef HAVE_GLOB
+#ifdef GLOB_MARK
REGISTER_LONG_CONSTANT(GLOB_MARK, GLOB_MARK, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(GLOB_NOSORT, GLOB_NOSORT, CONST_CS |
CONST_PERSISTENT);
-#ifdef PHP_WIN32
+#endif
+#ifdef GLOB_NOSORT
+ REGISTER_LONG_CONSTANT(GLOB_NOSORT, GLOB_NOSORT, CONST_CS | CONST_PERSISTENT);
+#endif
+#ifdef GLOB_NOCHECK
+ REGISTER_LONG_CONSTANT(GLOB_NOMATCH, GLOB_NOCHECK, CONST_CS |
+CONST_PERSISTENT);
+#endif
+#ifdef GLOB_NOESCAPE
REGISTER_LONG_CONSTANT(GLOB_NOESCAPE, GLOB_NOESCAPE, CONST_CS |
CONST_PERSISTENT);
#endif
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard dir.c
sniper Fri Sep 27 09:15:56 2002 EDT
Modified files:
/php4/ext/standard dir.c
Log:
ws
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.104 php4/ext/standard/dir.c:1.105
--- php4/ext/standard/dir.c:1.104 Fri Sep 27 08:40:31 2002
+++ php4/ext/standard/dir.c Fri Sep 27 09:15:56 2002
-16,7 +16,7
+--+
*/
-/* $Id: dir.c,v 1.104 2002/09/27 12:40:31 hholzgra Exp $ */
+/* $Id: dir.c,v 1.105 2002/09/27 13:15:56 sniper Exp $ */
/* {{{ includes/startup/misc */
-135,7 +135,7
REGISTER_LONG_CONSTANT(GLOB_MARK, GLOB_MARK, CONST_CS | CONST_PERSISTENT);
#endif
#ifdef GLOB_NOSORT
- REGISTER_LONG_CONSTANT(GLOB_NOSORT, GLOB_NOSORT, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(GLOB_NOSORT, GLOB_NOSORT, CONST_CS |
+CONST_PERSISTENT);
#endif
#ifdef GLOB_NOCHECK
REGISTER_LONG_CONSTANT(GLOB_NOMATCH, GLOB_NOCHECK, CONST_CS |
CONST_PERSISTENT);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd gd.dsp gd_bundled.dsp
edink Fri Sep 27 09:31:43 2002 EDT Modified files: /php4/ext/gdgd.dsp gd_bundled.dsp Log: - Fixed bug #19595 (Missing functions for GD2 format handling). (Edin) Fixed bug #19595 (Missing functions for GD2 format handling). Index: php4/ext/gd/gd.dsp diff -u php4/ext/gd/gd.dsp:1.8 php4/ext/gd/gd.dsp:1.9 --- php4/ext/gd/gd.dsp:1.8 Fri Jun 28 22:01:32 2002 +++ php4/ext/gd/gd.dsp Fri Sep 27 09:31:43 2002 -46,7 +46,7 # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_LIBTTF=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /FR /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D HAVE_LIBGD15=1 /D HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D HAVE_GD_STRINGTTF=1 /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I +..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=0 /D HAVE_LIBGD15=1 /D +HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D +HAVE_GD_STRINGTTF=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 +/D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D +HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_GD_GD2 +/FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG -75,7 +75,7 # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_LIBTTF=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /FR /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_LIBTTF=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I +..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=0 /D HAVE_LIBTTF=1 /D +HAVE_LIBGD15=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D +ZEND_WIN32 /D PHP_WIN32 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D +HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_GD_GD2 +/FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG -104,7 +104,7 # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_LIBTTF=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /FR /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D HAVE_LIBGD15 /D HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D HAVE_GD_STRINGTTF=1 /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I +..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=1 /D HAVE_LIBGD15 /D +HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D +HAVE_GD_STRINGTTF=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 +/D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D +HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_GD_GD2 +/FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG -133,7 +133,7 # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I
[PHP-CVS] cvs: CVSROOT / avail
rasmus Fri Sep 27 12:04:22 2002 EDT Modified files: /CVSROOTavail Log: Karma for David Viner Index: CVSROOT/avail diff -u CVSROOT/avail:1.505 CVSROOT/avail:1.506 --- CVSROOT/avail:1.505 Thu Sep 26 08:39:11 2002 +++ CVSROOT/avail Fri Sep 27 12:04:22 2002 -18,7 +18,7 # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -avail|mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,shuric,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,svbegg,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jedi,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi|phpfi,php3,php4,phpdoc,pear,peardoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh +avail|mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,shuric,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,svbegg,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jedi,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner|phpfi,php3,php4,phpdoc,pear,peardoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh # People who work on the Engine -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Fri Sep 27 12:30:10 2002 EDT Modified files: /CVSROOTavail Log: Karma for Brian France Index: CVSROOT/avail diff -u CVSROOT/avail:1.506 CVSROOT/avail:1.507 --- CVSROOT/avail:1.506 Fri Sep 27 12:04:22 2002 +++ CVSROOT/avail Fri Sep 27 12:30:09 2002 -18,7 +18,7 # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -avail|mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,shuric,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,svbegg,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jedi,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner|phpfi,php3,php4,phpdoc,pear,peardoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh +avail|mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,shuric,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,svbegg,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jedi,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance|phpfi,php3,php4,phpdoc,pear,peardoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh # People who work on the Engine -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/standard credits_ext.h credits_sapi.h
Probably something to do with ext/rpc containing the ZE2 versions of those extensions. --Wez. On 27/09/02, Edin Kadribasic [EMAIL PROTECTED] wrote: # Updated by scripts/credits. For some reason it put Java and Win32 COM # twice. I removed the duplicates manually. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/ncurses config.m4 ncurses.c ncurses_fe.c ncurses_functions.c php_ncurses.h php_ncurses_fe.h
wez Fri Sep 27 13:03:54 2002 EDT
Modified files:
/php4/ext/ncurses config.m4 ncurses.c ncurses_fe.c
ncurses_functions.c php_ncurses.h
php_ncurses_fe.h
Log:
Implement some more window routines, add pad functions.
Add panel functions when libpanel is also detected.
Register STDSCR constant during ncurses_init().
Index: php4/ext/ncurses/config.m4
diff -u php4/ext/ncurses/config.m4:1.12 php4/ext/ncurses/config.m4:1.13
--- php4/ext/ncurses/config.m4:1.12 Wed Jun 26 18:22:47 2002
+++ php4/ext/ncurses/config.m4 Fri Sep 27 13:03:53 2002
-1,5 +1,5
dnl
-dnl $Id: config.m4,v 1.12 2002/06/26 22:22:47 avsm Exp $
+dnl $Id: config.m4,v 1.13 2002/09/27 17:03:53 wez Exp $
dnl
PHP_ARG_WITH(ncurses, for ncurses support,
-37,13 +37,23
PHP_CHECK_LIBRARY($LIBNAME, $LIBSYMBOL, [
AC_DEFINE(HAVE_NCURSESLIB,1,[ ])
- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $NCURSES_DIR/lib, NCURSES_SHARED_LIBADD)
+
+PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $NCURSES_DIR/lib, NCURSES_SHARED_LIBADD)
+
+ PHP_CHECK_LIBRARY(panel, new_panel, [
+ AC_DEFINE(HAVE_NCURSES_PANEL,1,[ ])
+ PHP_ADD_LIBRARY_WITH_PATH(panel, $NCURSES_DIR/lib, NCURSES_SHARED_LIBADD)
+ ], [
+ ], [ -L$NCURSES_DIR/lib -l$LIBNAME -lm
+ ])
+
+
], [
AC_MSG_ERROR(Wrong ncurses lib version or lib not found)
], [
-L$NCURSES_DIR/lib -lm
])
-
+
AC_CHECK_LIB($LIBNAME, color_set, [AC_DEFINE(HAVE_NCURSES_COLOR_SET, 1, [ ])])
AC_CHECK_LIB($LIBNAME, slk_color, [AC_DEFINE(HAVE_NCURSES_SLK_COLOR, 1, [ ])])
AC_CHECK_LIB($LIBNAME, asume_default_colors,
[AC_DEFINE(HAVE_NCURSES_ASSUME_DEFAULT_COLORS, 1, [ ])])
Index: php4/ext/ncurses/ncurses.c
diff -u php4/ext/ncurses/ncurses.c:1.16 php4/ext/ncurses/ncurses.c:1.17
--- php4/ext/ncurses/ncurses.c:1.16 Thu Feb 28 03:26:26 2002
+++ php4/ext/ncurses/ncurses.c Fri Sep 27 13:03:53 2002
-30,10 +30,12
*/
/* True global resources - no need for thread safety here */
-int le_ncurses;
-
+int le_ncurses_windows;
+#if HAVE_NCURSES_PANEL
+int le_ncurses_panels;
+#endif
-static void ncurses_destruct(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+static void ncurses_destruct_window(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
WINDOW **pwin = (WINDOW **)rsrc-ptr;
-41,6 +43,15
efree(pwin);
}
+#if HAVE_NCURSES_PANEL
+static void ncurses_destruct_panel(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
+ PANEL **ppanel = (PANEL **)rsrc-ptr;
+
+ del_panel(*ppanel);
+ efree(ppanel);
+}
+#endif
/* {{{ ncurses_module_entry
*/
-238,7 +249,10
PHP_NCURSES_CONST(ALL_MOUSE_EVENTS);
PHP_NCURSES_CONST(REPORT_MOUSE_POSITION);
-le_ncurses = zend_register_list_destructors_ex(ncurses_destruct, NULL,
ncurses_handle, module_number);
+le_ncurses_windows = zend_register_list_destructors_ex(ncurses_destruct_window,
+NULL, ncurses_window, module_number);
+#if HAVE_NCURSES_PANEL
+le_ncurses_panels = zend_register_list_destructors_ex(ncurses_destruct_panel,
+NULL, ncurses_panel, module_number);
+#endif
return SUCCESS;
}
Index: php4/ext/ncurses/ncurses_fe.c
diff -u php4/ext/ncurses/ncurses_fe.c:1.14 php4/ext/ncurses/ncurses_fe.c:1.15
--- php4/ext/ncurses/ncurses_fe.c:1.14 Thu Feb 28 03:26:27 2002
+++ php4/ext/ncurses/ncurses_fe.c Fri Sep 27 13:03:53 2002
-162,6 +162,31
PHP_FE(ncurses_wgetch, NULL)
PHP_FE(ncurses_keypad, NULL)
PHP_FE(ncurses_wmove, NULL)
+
+ PHP_FE(ncurses_newpad, NULL)
+ PHP_FE(ncurses_prefresh,NULL)
+ PHP_FE(ncurses_pnoutrefresh,NULL)
+ PHP_FE(ncurses_wstandout, NULL)
+ PHP_FE(ncurses_wstandend, NULL)
+ PHP_FE(ncurses_wattrset,NULL)
+ PHP_FE(ncurses_wattron, NULL)
+ PHP_FE(ncurses_wattroff,NULL)
+
+#if HAVE_NCURSES_PANEL
+ PHP_FE(ncurses_update_panels, NULL)
+ PHP_FE(ncurses_panel_window,NULL)
+ PHP_FE(ncurses_panel_below, NULL)
+ PHP_FE(ncurses_panel_above, NULL)
+ PHP_FE(ncurses_replace_panel, NULL)
+ PHP_FE(ncurses_move_panel, NULL)
+ PHP_FE(ncurses_bottom_panel,NULL)
+ PHP_FE(ncurses_top_panel, NULL)
+ PHP_FE(ncurses_show_panel, NULL)
+ PHP_FE(ncurses_hide_panel, NULL)
+ PHP_FE(ncurses_del_panel, NULL)
+ PHP_FE(ncurses_new_panel, NULL)
+#endif
+
{NULL, NULL, NULL} /* Must be the last line in ncurses_functions[] */
};
Index: php4/ext/ncurses/ncurses_functions.c
diff -u php4/ext/ncurses/ncurses_functions.c:1.19
php4/ext/ncurses/ncurses_functions.c:1.20
--- php4/ext/ncurses/ncurses_functions.c:1.19 Thu Aug 22 08:15:20 2002
+++ php4/ext/ncurses/ncurses_functions.cFri Sep 27 13:03:53 2002
-25,9 +25,10
#include php_ini.h
#include php_ncurses.h
-#define FETCH_WINRES(r, z)
[PHP-CVS] cvs: php4 /ext/ncurses ncurses.c ncurses_fe.c ncurses_functions.c php_ncurses.h php_ncurses_fe.h
wez Fri Sep 27 18:33:14 2002 EDT
Modified files:
/php4/ext/ncurses ncurses.c ncurses_fe.c ncurses_functions.c
php_ncurses.h php_ncurses_fe.h
Log:
More ncurses functions and constants.
Index: php4/ext/ncurses/ncurses.c
diff -u php4/ext/ncurses/ncurses.c:1.17 php4/ext/ncurses/ncurses.c:1.18
--- php4/ext/ncurses/ncurses.c:1.17 Fri Sep 27 13:03:53 2002
+++ php4/ext/ncurses/ncurses.c Fri Sep 27 18:33:14 2002
-25,9 +25,7
#include php_ncurses.h
#include ext/standard/info.h
-/* If you declare any globals in php_ncurses.h uncomment this:
ZEND_DECLARE_MODULE_GLOBALS(ncurses)
-*/
/* True global resources - no need for thread safety here */
int le_ncurses_windows;
Index: php4/ext/ncurses/ncurses_fe.c
diff -u php4/ext/ncurses/ncurses_fe.c:1.15 php4/ext/ncurses/ncurses_fe.c:1.16
--- php4/ext/ncurses/ncurses_fe.c:1.15 Fri Sep 27 13:03:53 2002
+++ php4/ext/ncurses/ncurses_fe.c Fri Sep 27 18:33:14 2002
-171,6 +171,10
PHP_FE(ncurses_wattrset,NULL)
PHP_FE(ncurses_wattron, NULL)
PHP_FE(ncurses_wattroff,NULL)
+ PHP_FE(ncurses_waddch, NULL)
+ PHP_FE(ncurses_wborder, NULL)
+ PHP_FE(ncurses_whline, NULL)
+ PHP_FE(ncurses_wvline, NULL)
#if HAVE_NCURSES_PANEL
PHP_FE(ncurses_update_panels, NULL)
Index: php4/ext/ncurses/ncurses_functions.c
diff -u php4/ext/ncurses/ncurses_functions.c:1.20
php4/ext/ncurses/ncurses_functions.c:1.21
--- php4/ext/ncurses/ncurses_functions.c:1.20 Fri Sep 27 13:03:53 2002
+++ php4/ext/ncurses/ncurses_functions.cFri Sep 27 18:33:14 2002
-44,6 +44,26
}
/* }}} */
+/* {{{ proto int ncurses_waddch(resource window, int ch)
+ Adds character at current position in a window and advance cursor */
+PHP_FUNCTION(ncurses_waddch)
+{
+ long ch;
+ zval *handle;
+ WINDOW **win;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rl, handle,
+ch)==FAILURE) {
+return;
+ }
+
+ FETCH_WINRES(win, handle);
+
+ RETURN_LONG(waddch(*win, ch));
+}
+/* }}} */
+
+
+
/* {{{ proto int ncurses_color_set(int pair)
Sets fore- and background color */
PHP_FUNCTION(ncurses_color_set)
-106,26 +126,69
Initializes ncurses */
PHP_FUNCTION(ncurses_init)
{
- zend_constant c;
- WINDOW **pscr = (WINDOW**)emalloc(sizeof(WINDOW *));
- zval *zscr;
-
initscr(); /* initialize the curses library */
keypad(stdscr, TRUE); /* enable keyboard mapping */
(void) nonl(); /* tell curses not to do NL-CR/NL on output */
(void) cbreak(); /* take input chars one at a time, no wait for \n */
- *pscr = stdscr;
- MAKE_STD_ZVAL(zscr);
- ZEND_REGISTER_RESOURCE(zscr, pscr, le_ncurses_windows);
- c.value = *zscr;
- zval_copy_ctor(c.value);
- c.flags = CONST_CS;
- c.name = zend_strndup(STDSCR, 7);
- c.name_len = 7;
- zend_register_constant(c TSRMLS_CC);
-
- FREE_ZVAL(zscr);
+ if (!NCURSES_G(registered_constants)) {
+ zend_constant c;
+
+ WINDOW **pscr = (WINDOW**)emalloc(sizeof(WINDOW *));
+ zval *zscr;
+
+ *pscr = stdscr;
+ MAKE_STD_ZVAL(zscr);
+ ZEND_REGISTER_RESOURCE(zscr, pscr, le_ncurses_windows);
+ c.value = *zscr;
+ zval_copy_ctor(c.value);
+ c.flags = CONST_CS;
+ c.name = zend_strndup(STDSCR, 7);
+ c.name_len = 7;
+ zend_register_constant(c TSRMLS_CC);
+
+ /* we need this interesting arrangement because the
+* underlying values of the ACS_XXX defines are not
+* initialized until after ncurses has been initialized */
+
+#define PHP_NCURSES_DEF_CONST(x)\
+ ZVAL_LONG(zscr, x); \
+ c.value = *zscr;\
+ zval_copy_ctor(c.value); \
+ c.flags = CONST_CS; \
+ c.name = zend_strndup(NCURSES_ #x, sizeof(NCURSES_ #x)); \
+ c.name_len = sizeof(NCURSES_ #x); \
+ zend_register_constant(c TSRMLS_CC)
+
+ PHP_NCURSES_DEF_CONST(ACS_ULCORNER);
+ PHP_NCURSES_DEF_CONST(ACS_LLCORNER);
+ PHP_NCURSES_DEF_CONST(ACS_URCORNER);
+ PHP_NCURSES_DEF_CONST(ACS_LRCORNER);
+ PHP_NCURSES_DEF_CONST(ACS_LTEE);
+ PHP_NCURSES_DEF_CONST(ACS_RTEE);
+ PHP_NCURSES_DEF_CONST(ACS_BTEE);
+ PHP_NCURSES_DEF_CONST(ACS_TTEE);
+ PHP_NCURSES_DEF_CONST(ACS_HLINE);
+ PHP_NCURSES_DEF_CONST(ACS_VLINE);
+ PHP_NCURSES_DEF_CONST(ACS_PLUS);
+ PHP_NCURSES_DEF_CONST(ACS_S1);
+
[PHP-CVS] cvs: php4 /ext/standard basic_functions.c file.c file.h
wez Fri Sep 27 19:42:38 2002 EDT
Modified files:
/php4/ext/standard basic_functions.c file.c file.h
Log:
Implement stream_select() which works just like socket_select, but only on
streams.
- Added stream_select() which works like socket_select but only works on
streams returned by fopen(), fsockopen() and pfsockopen(). (Wez)
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.513
php4/ext/standard/basic_functions.c:1.514
--- php4/ext/standard/basic_functions.c:1.513 Thu Sep 26 06:14:40 2002
+++ php4/ext/standard/basic_functions.c Fri Sep 27 19:42:38 2002
-17,7 +17,7
+--+
*/
-/* $Id: basic_functions.c,v 1.513 2002/09/26 10:14:40 wez Exp $ */
+/* $Id: basic_functions.c,v 1.514 2002/09/27 23:42:38 wez Exp $ */
#include php.h
#include php_streams.h
-99,6 +99,9
static unsigned char second_args_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE };
static unsigned char third_and_fourth_args_force_ref[] = { 4, BYREF_NONE, BYREF_NONE,
BYREF_FORCE, BYREF_FORCE };
static unsigned char third_and_rest_force_ref[] = { 3, BYREF_NONE, BYREF_NONE,
BYREF_FORCE_REST };
+static unsigned char first_through_third_args_force_ref[] =
+{3, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE};
+
typedef struct _php_shutdown_function_entry {
zval **arguments;
-617,6 +620,7
PHP_STATIC_FE(tmpfile,php_if_tmpfile,
NULL)
PHP_FE(file,
NULL)
PHP_FE(file_get_contents,
NULL)
+ PHP_FE(stream_select,
+first_through_third_args_force_ref)
PHP_FE(stream_context_create,
NULL)
PHP_FE(stream_context_set_params,
NULL)
PHP_FE(stream_context_set_option,
NULL)
-628,11 +632,9
PHP_FE(get_meta_tags,
NULL)
PHP_FE(set_file_buffer,
NULL)
- /* set_socket_blocking() is deprecated,
- use socket_set_blocking() instead
- */
PHP_FE(set_socket_blocking,
NULL)
- PHP_FE(socket_set_blocking,
NULL)
+ PHP_FE(stream_set_blocking,
+ NULL)
+ PHP_FALIAS(socket_set_blocking, stream_set_blocking,
+ NULL)
PHP_FE(file_get_meta_data,
NULL)
PHP_FE(file_register_wrapper,
NULL)
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.263 php4/ext/standard/file.c:1.264
--- php4/ext/standard/file.c:1.263 Thu Sep 26 08:12:26 2002
+++ php4/ext/standard/file.cFri Sep 27 19:42:38 2002
-21,7 +21,7
+--+
*/
-/* $Id: file.c,v 1.263 2002/09/26 12:12:26 wez Exp $ */
+/* $Id: file.c,v 1.264 2002/09/27 23:42:38 wez Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
-639,6 +639,130
}
/* }}} */
+static int stream_array_to_fd_set(zval *stream_array, fd_set *fds, int *max_fd
+TSRMLS_DC)
+{
+ zval **elem;
+ php_stream *stream;
+ int this_fd;
+
+ if (Z_TYPE_P(stream_array) != IS_ARRAY)
+ return 0;
+
+ for (zend_hash_internal_pointer_reset(Z_ARRVAL_P(stream_array));
+zend_hash_get_current_data(Z_ARRVAL_P(stream_array), (void **) elem)
+== SUCCESS;
+zend_hash_move_forward(Z_ARRVAL_P(stream_array))) {
+
+ php_stream_from_zval_no_verify(stream, elem);
+ if (stream == NULL)
+ continue;
+
+ /* get the fd */
+ if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD,
+(void*)this_fd, 1)) {
+ FD_SET(this_fd, fds);
+ if (this_fd *max_fd) {
+ *max_fd = this_fd;
+ }
+ }
+ }
+
+ return 1;
+
