[PHP-CVS] cvs: php-src(PHP_4_3) / makerpm
helly Wed Jan 21 02:19:07 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcmakerpm Log: Add these files to the actual package http://cvs.php.net/diff.php/php-src/makerpm?r1=1.4.8.2r2=1.4.8.3ty=u Index: php-src/makerpm diff -u php-src/makerpm:1.4.8.2 php-src/makerpm:1.4.8.3 --- php-src/makerpm:1.4.8.2 Wed Jan 21 01:58:04 2004 +++ php-src/makerpm Wed Jan 21 02:19:07 2004 @@ -146,6 +146,9 @@ %defattr(-,root,root) /usr/lib/apache/libphp4.so /usr/bin/php +/usr/bin/php_cgi +/man/man1/php.1* +/etc/php.ini %doc TODO CODING_STANDARDS CREDITS ChangeLog LICENSE NEWS EOF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / .cvsignore /build build.mk
sniper Wed Jan 21 02:47:12 2004 EDT Modified files: /php-src.cvsignore /php-src/build build.mk Log: Last php4 occurances.. http://cvs.php.net/diff.php/php-src/.cvsignore?r1=1.49r2=1.50ty=u Index: php-src/.cvsignore diff -u php-src/.cvsignore:1.49 php-src/.cvsignore:1.50 --- php-src/.cvsignore:1.49 Sat Jan 3 08:51:55 2004 +++ php-src/.cvsignore Wed Jan 21 02:47:11 2004 @@ -29,7 +29,7 @@ libtool shlibtool php -php4.spec +php5.spec stamp-h test.php3 *.lo http://cvs.php.net/diff.php/php-src/build/build.mk?r1=1.22r2=1.23ty=u Index: php-src/build/build.mk diff -u php-src/build/build.mk:1.22 php-src/build/build.mk:1.23 --- php-src/build/build.mk:1.22 Thu Jan 8 12:31:49 2004 +++ php-src/build/build.mk Wed Jan 21 02:47:11 2004 @@ -14,7 +14,7 @@ # | Author: Sascha Schumann [EMAIL PROTECTED] | # +--+ # -# $Id: build.mk,v 1.22 2004/01/08 17:31:49 sniper Exp $ +# $Id: build.mk,v 1.23 2004/01/21 07:47:11 sniper Exp $ # # # Makefile to generate build tools @@ -45,7 +45,7 @@ snapshot: distname='$(DISTNAME)'; \ if test -z $$distname; then \ - distname='php4-snapshot'; \ + distname='php5-snapshot'; \ fi; \ myname=`basename \`pwd\`` ; \ cd .. cp -rp $$myname $$distname; \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite Makefile.frag
jon Wed Jan 21 03:51:29 2004 EDT Modified files: /php-src/ext/sqlite Makefile.frag Log: Adding dependencies on sqlite.h for the rest of the source files in the libsqlite distribution. http://cvs.php.net/diff.php/php-src/ext/sqlite/Makefile.frag?r1=1.8r2=1.9ty=u Index: php-src/ext/sqlite/Makefile.frag diff -u php-src/ext/sqlite/Makefile.frag:1.8 php-src/ext/sqlite/Makefile.frag:1.9 --- php-src/ext/sqlite/Makefile.frag:1.8Sat Jan 17 16:03:26 2004 +++ php-src/ext/sqlite/Makefile.fragWed Jan 21 03:51:28 2004 @@ -40,8 +40,12 @@ $(srcdir)/libsqlite/src/copy.c: $(srcdir)/libsqlite/src/sqlite.h +$(srcdir)/libsqlite/src/date.c: $(srcdir)/libsqlite/src/sqlite.h + $(srcdir)/libsqlite/src/delete.c: $(srcdir)/libsqlite/src/sqlite.h +$(srcdir)/libsqlite/src/encode.c: $(srcdir)/libsqlite/src/sqlite.h + $(srcdir)/libsqlite/src/expr.c: $(srcdir)/libsqlite/src/sqlite.h $(srcdir)/libsqlite/src/func.c: $(srcdir)/libsqlite/src/sqlite.h -- 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 /ext/interbase interbase.c
abies Wed Jan 21 05:12:20 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/interbase interbase.c
/php-srcNEWS
Log:
Fixed bug #26968 (Segfault with Interbase module built as shared)
http://cvs.php.net/diff.php/php-src/ext/interbase/interbase.c?r1=1.91.2.27r2=1.91.2.28ty=u
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.91.2.27
php-src/ext/interbase/interbase.c:1.91.2.28
--- php-src/ext/interbase/interbase.c:1.91.2.27 Wed Jan 7 04:44:21 2004
+++ php-src/ext/interbase/interbase.c Wed Jan 21 05:12:14 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: interbase.c,v 1.91.2.27 2004/01/07 09:44:21 abies Exp $ */
+/* $Id: interbase.c,v 1.91.2.28 2004/01/21 10:12:14 abies Exp $ */
/* TODO: Arrays, roles?
@@ -594,6 +594,25 @@
PHP_MSHUTDOWN_FUNCTION(ibase)
{
+#ifndef PHP_WIN32
+ /**
+* When the Interbase client API library libgds.so is first loaded, it
registers a call to
+* gds__cleanup() with atexit(), in order to clean up after itself when the
process exits.
+* This means that the library is called at process shutdown, and cannot be
unloaded beforehand.
+* PHP tries to unload modules after every request [dl()'ed modules], and
right before the
+* process shuts down [modules loaded from php.ini]. This results in a
segfault for this module.
+* By NULLing the dlopen() handle in the module entry, Zend omits the call to
dlclose(),
+* ensuring that the module will remain present until the process exits.
However, the functions
+* and classes exported by the module will not be available until the module
is 'reloaded'.
+* When reloaded, dlopen() will return the handle of the already loaded
module. The module will
+* be unloaded automatically when the process exits.
+*/
+ zend_module_entry *ibase_entry;
+ if (SUCCESS == zend_hash_find(module_registry, ibase_module_entry.name,
strlen(ibase_module_entry.name) +1, (void*) ibase_entry))
+ {
+ ibase_entry-handle = NULL;
+ }
+#endif
UNREGISTER_INI_ENTRIES();
return SUCCESS;
}
@@ -624,7 +643,7 @@
php_info_print_table_start();
php_info_print_table_row(2, Interbase Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.91.2.27 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.91.2.28 $);
#ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, Dynamic Module, yes);
#endif
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.537r2=1.1247.2.538ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.537 php-src/NEWS:1.1247.2.538
--- php-src/NEWS:1.1247.2.537 Tue Jan 20 23:00:46 2004
+++ php-src/NEWSWed Jan 21 05:12:17 2004
@@ -5,6 +5,7 @@
safe_mode/open_basedir). (Ilia)
- Fixed bug #26973 (*printf() '+' modifier broken). (Jani)
- Fixed bug #26969 (--with-openssl=shared build fails). (Jani)
+- Fixed bug #26968 (Segfault with Interbase module built as shared). (Ard)
- Fixed bug #26949 (rand(min,max) always returns min when ZTS enabled). (Jani)
- Fixed bug #26937 (Warning in xml.c). (Jani)
- Fixed Bug #26927 (preg_quote() does not escape \0). (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams userspace.c
hholzgraWed Jan 21 05:17:14 2004 EDT
Modified files:
/php-src/main/streams userspace.c
Log:
stream_lock() method added to userspace streams wrapper
http://cvs.php.net/diff.php/php-src/main/streams/userspace.c?r1=1.18r2=1.19ty=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.18 php-src/main/streams/userspace.c:1.19
--- php-src/main/streams/userspace.c:1.18 Thu Jan 8 03:17:59 2004
+++ php-src/main/streams/userspace.cWed Jan 21 05:17:12 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: userspace.c,v 1.18 2004/01/08 08:17:59 andi Exp $ */
+/* $Id: userspace.c,v 1.19 2004/01/21 10:17:12 hholzgra Exp $ */
#include php.h
#include php_globals.h
@@ -110,6 +110,7 @@
#define USERSTREAM_DIR_READdir_readdir
#define USERSTREAM_DIR_REWIND dir_rewinddir
#define USERSTREAM_DIR_CLOSE dir_closedir
+#define USERSTREAM_LOCK stream_lock
/* {{{ class should have methods like these:
@@ -759,6 +760,55 @@
return ret;
}
+
+static int php_userstreamop_set_option(php_stream *stream, int option, int value,
void *ptrparam TSRMLS_DC) {
+ zval func_name;
+ zval *retval = NULL;
+ int call_result;
+ php_userstream_data_t *us = (php_userstream_data_t *)stream-abstract;
+ int ret = -1;
+ zval *zvalue;
+ zval **args[1];
+
+ MAKE_STD_ZVAL(zvalue);
+ ZVAL_LONG(zvalue, value);
+ args[0] = zvalue;
+
+ switch (option) {
+ case PHP_STREAM_OPTION_LOCKING:
+ // TODO wouldblock
+ ZVAL_STRINGL(func_name, USERSTREAM_LOCK, sizeof(USERSTREAM_LOCK)-1,
0);
+
+ call_result = call_user_function_ex(NULL,
+
us-object,
+
func_name,
+
retval,
+
1, args, 0, NULL TSRMLS_CC);
+
+ if (call_result == SUCCESS retval != NULL Z_TYPE_P(retval) ==
IS_BOOL) {
+ ret = !Z_LVAL_P(retval);
+ } else if (call_result == FAILURE) {
+ if (value == 0) {
+ ret = 0; // lock support test (TODO: more check)
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s::
USERSTREAM_LOCK is not implemented!,
+
us-wrapper-classname);
+ }
+ }
+
+ if (retval)
+ zval_ptr_dtor(retval);
+
+ break;
+ }
+
+ /* clean up */
+ zval_ptr_dtor(zvalue);
+
+ return ret;
+}
+
+
static int user_wrapper_unlink(php_stream_wrapper *wrapper, char *url, int options,
php_stream_context *context TSRMLS_DC)
{
struct php_user_stream_wrapper *uwrap = (struct
php_user_stream_wrapper*)wrapper-abstract;
@@ -1152,6 +1202,7 @@
{
zval func_name;
zval *retval = NULL;
+ zval **args[1];
php_userstream_data_t *us = (php_userstream_data_t *)stream-abstract;
ZVAL_STRINGL(func_name, USERSTREAM_DIR_REWIND,
sizeof(USERSTREAM_DIR_REWIND)-1, 0);
@@ -1175,8 +1226,8 @@
user-space,
php_userstreamop_seek,
NULL, /* cast */
- php_userstreamop_stat, /* stat */
- NULL /* set_option */
+ php_userstreamop_stat,
+ php_userstreamop_set_option,
};
php_stream_ops php_stream_userspace_dir_ops = {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tidy php_tidy.h tidy.c
johnWed Jan 21 05:19:57 2004 EDT
Modified files:
/php-src/ext/tidy php_tidy.h tidy.c
Log:
Moving the OO syntax to studlyCaps.
I am *not* changing this back :)
http://cvs.php.net/diff.php/php-src/ext/tidy/php_tidy.h?r1=1.18r2=1.19ty=u
Index: php-src/ext/tidy/php_tidy.h
diff -u php-src/ext/tidy/php_tidy.h:1.18 php-src/ext/tidy/php_tidy.h:1.19
--- php-src/ext/tidy/php_tidy.h:1.18Wed Jan 14 03:15:57 2004
+++ php-src/ext/tidy/php_tidy.h Wed Jan 21 05:19:56 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_tidy.h,v 1.18 2004/01/14 08:15:57 john Exp $ */
+/* $Id: php_tidy.h,v 1.19 2004/01/21 10:19:56 john Exp $ */
#ifndef PHP_TIDY_H
#define PHP_TIDY_H
@@ -254,20 +254,20 @@
PHP_FUNCTION(tidy_get_body);
TIDY_DOC_METHOD(__construct);
-TIDY_DOC_METHOD(parse_file);
-TIDY_DOC_METHOD(parse_string);
+TIDY_DOC_METHOD(parseFile);
+TIDY_DOC_METHOD(parseString);
TIDY_NODE_METHOD(__construct);
-TIDY_NODE_METHOD(has_children);
-TIDY_NODE_METHOD(has_siblings);
-TIDY_NODE_METHOD(is_comment);
-TIDY_NODE_METHOD(is_html);
-TIDY_NODE_METHOD(is_xhtml);
-TIDY_NODE_METHOD(is_xml);
-TIDY_NODE_METHOD(is_text);
-TIDY_NODE_METHOD(is_jste);
-TIDY_NODE_METHOD(is_asp);
-TIDY_NODE_METHOD(is_php);
+TIDY_NODE_METHOD(hasChildren);
+TIDY_NODE_METHOD(hasSiblings);
+TIDY_NODE_METHOD(isComment);
+TIDY_NODE_METHOD(isHtml);
+TIDY_NODE_METHOD(isXhtml);
+TIDY_NODE_METHOD(isXml);
+TIDY_NODE_METHOD(isText);
+TIDY_NODE_METHOD(isJste);
+TIDY_NODE_METHOD(isAsp);
+TIDY_NODE_METHOD(isPhp);
ZEND_BEGIN_MODULE_GLOBALS(tidy)
char *default_config;
http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.35r2=1.36ty=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.35 php-src/ext/tidy/tidy.c:1.36
--- php-src/ext/tidy/tidy.c:1.35Wed Jan 14 07:19:17 2004
+++ php-src/ext/tidy/tidy.c Wed Jan 21 05:19:56 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tidy.c,v 1.35 2004/01/14 12:19:17 wez Exp $ */
+/* $Id: tidy.c,v 1.36 2004/01/21 10:19:56 john Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -71,19 +71,19 @@
};
function_entry tidy_funcs_doc[] = {
- TIDY_METHOD_MAP(getopt, tidy_getopt, NULL)
- TIDY_METHOD_MAP(clean_repair, tidy_clean_repair, NULL)
- TIDY_DOC_ME(parse_file, NULL)
- TIDY_DOC_ME(parse_string, NULL)
- TIDY_METHOD_MAP(repair_string, tidy_repair_string, NULL)
- TIDY_METHOD_MAP(repair_file, tidy_repair_file, NULL)
+ TIDY_METHOD_MAP(getOpt, tidy_getopt, NULL)
+ TIDY_METHOD_MAP(cleanRepair, tidy_clean_repair, NULL)
+ TIDY_DOC_ME(parseFile, NULL)
+ TIDY_DOC_ME(parseString, NULL)
+ TIDY_METHOD_MAP(repairString, tidy_repair_string, NULL)
+ TIDY_METHOD_MAP(repairFile, tidy_repair_file, NULL)
TIDY_METHOD_MAP(diagnose, tidy_diagnose, NULL)
- TIDY_METHOD_MAP(get_release, tidy_get_release, NULL)
- TIDY_METHOD_MAP(get_config, tidy_get_config, NULL)
- TIDY_METHOD_MAP(get_status, tidy_get_status, NULL)
- TIDY_METHOD_MAP(get_html_ver, tidy_get_html_ver, NULL)
- TIDY_METHOD_MAP(is_xhtml, tidy_is_xhtml, NULL)
- TIDY_METHOD_MAP(is_xml, tidy_is_xml, NULL)
+ TIDY_METHOD_MAP(getRelease, tidy_get_release, NULL)
+ TIDY_METHOD_MAP(getConfig, tidy_get_config, NULL)
+ TIDY_METHOD_MAP(getStatus, tidy_get_status, NULL)
+ TIDY_METHOD_MAP(getHtmlVer, tidy_get_html_ver, NULL)
+ TIDY_METHOD_MAP(isXhtml, tidy_is_xhtml, NULL)
+ TIDY_METHOD_MAP(isXml, tidy_is_xml, NULL)
TIDY_METHOD_MAP(root, tidy_get_root, NULL)
TIDY_METHOD_MAP(head, tidy_get_head, NULL)
TIDY_METHOD_MAP(html, tidy_get_html, NULL)
@@ -95,14 +95,14 @@
function_entry tidy_funcs_node[] = {
TIDY_NODE_ME(__construct, NULL)
- TIDY_NODE_ME(has_children, NULL)
- TIDY_NODE_ME(has_siblings, NULL)
- TIDY_NODE_ME(is_comment, NULL)
- TIDY_NODE_ME(is_html, NULL)
- TIDY_NODE_ME(is_text, NULL)
- TIDY_NODE_ME(is_jste, NULL)
- TIDY_NODE_ME(is_asp, NULL)
- TIDY_NODE_ME(is_php, NULL)
+ TIDY_NODE_ME(hasChildren, NULL)
+ TIDY_NODE_ME(hasSiblings, NULL)
+ TIDY_NODE_ME(isComment, NULL)
+ TIDY_NODE_ME(isHtml, NULL)
+ TIDY_NODE_ME(isText, NULL)
+ TIDY_NODE_ME(isJste, NULL)
+ TIDY_NODE_ME(isAsp, NULL)
+ TIDY_NODE_ME(isPhp, NULL)
{NULL, NULL, NULL}
};
@@ -768,7 +768,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.35 2004/01/14 12:19:17 wez Exp $));
+ php_info_print_table_row(2, Extension Version, PHP_TIDY_MODULE_VERSION
($Id: tidy.c,v 1.36 2004/01/21 10:19:56 john Exp $));
[PHP-CVS] cvs: php-src / NEWS
hholzgraWed Jan 21 05:20:46 2004 EDT Modified files: /php-srcNEWS Log: News update on new streams method http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1584r2=1.1585ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1584 php-src/NEWS:1.1585 --- php-src/NEWS:1.1584 Mon Jan 19 19:26:23 2004 +++ php-src/NEWSWed Jan 21 05:20:45 2004 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? ??? 2004, PHP 5 RC1 +- Added stream_lock() method to userspace streams interface. (Hartmut, Wez) - Added xsltprocessor-registerPHPFunctions(). (Christian) - Bundled new SPL extension. (Marcus, Derick) - Upgraded SQLite library to version 2.8.11. (Ilia, Wez) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/interbase interbase.c
abies Wed Jan 21 05:22:05 2004 EDT
Modified files:
/php-src/ext/interbase interbase.c
Log:
MFB
http://cvs.php.net/diff.php/php-src/ext/interbase/interbase.c?r1=1.193r2=1.194ty=u
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.193 php-src/ext/interbase/interbase.c:1.194
--- php-src/ext/interbase/interbase.c:1.193 Mon Jan 12 15:03:49 2004
+++ php-src/ext/interbase/interbase.c Wed Jan 21 05:22:04 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: interbase.c,v 1.193 2004/01/12 20:03:49 abies Exp $ */
+/* $Id: interbase.c,v 1.194 2004/01/21 10:22:04 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -26,7 +26,7 @@
#include php.h
-#define FILE_REVISION $Revision: 1.193 $
+#define FILE_REVISION $Revision: 1.194 $
#if HAVE_IBASE
@@ -696,6 +696,25 @@
PHP_MSHUTDOWN_FUNCTION(ibase)
{
+#ifndef PHP_WIN32
+ /**
+* When the Interbase client API library libgds.so is first loaded, it
registers a call to
+* gds__cleanup() with atexit(), in order to clean up after itself when the
process exits.
+* This means that the library is called at process shutdown, and cannot be
unloaded beforehand.
+* PHP tries to unload modules after every request [dl()'ed modules], and
right before the
+* process shuts down [modules loaded from php.ini]. This results in a
segfault for this module.
+* By NULLing the dlopen() handle in the module entry, Zend omits the call to
dlclose(),
+* ensuring that the module will remain present until the process exits.
However, the functions
+* and classes exported by the module will not be available until the module
is 'reloaded'.
+* When reloaded, dlopen() will return the handle of the already loaded
module. The module will
+* be unloaded automatically when the process exits.
+*/
+ zend_module_entry *ibase_entry;
+ if (SUCCESS == zend_hash_find(module_registry, ibase_module_entry.name,
strlen(ibase_module_entry.name) +1, (void*) ibase_entry))
+ {
+ ibase_entry-handle = NULL;
+ }
+#endif
UNREGISTER_INI_ENTRIES();
return SUCCESS;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
gobaWed Jan 21 06:03:32 2004 EDT Modified files: /CVSROOTavail Log: Alphabetical ordering of phpdoc-LANG modules, so it is clear that we have not missed any... No Karma changes in this commit. http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.814r2=1.815ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.814 CVSROOT/avail:1.815 --- CVSROOT/avail:1.814 Fri Jan 16 17:12:35 2004 +++ CVSROOT/avail Wed Jan 21 06:03:31 2004 @@ -17,8 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -avail|alan_k,rrichards,tal,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,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry|phpfi,php3,php-src,phpdoc,pecl,pear,peardoc,spl,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-el,phpdoc-pt,livedocs - +avail|alan_k,rrichards,tal,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,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry|phpfi,php3,php-src,pecl,pear,peardoc,spl,phpdoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,livedocs # People who work on the Engine avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,sniper,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry|Zend,ZendEngine2,TSRM @@ -26,7 +25,7 @@ # The PHP Documentation Group maintains the documentation and its # translations.
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c /ext/simplexml/tests 015.phpt
rrichards Wed Jan 21 06:32:31 2004 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
/php-src/ext/simplexml/tests015.phpt
Log:
Fix Bug #26976 (Can not access array elements using array indices)
return index 0 as non iterable object
update test
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.119r2=1.120ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.119 php-src/ext/simplexml/simplexml.c:1.120
--- php-src/ext/simplexml/simplexml.c:1.119 Tue Jan 20 20:09:41 2004
+++ php-src/ext/simplexml/simplexml.c Wed Jan 21 06:32:29 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.119 2004/01/21 01:09:41 sniper Exp $ */
+/* $Id: simplexml.c,v 1.120 2004/01/21 11:32:29 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -191,21 +191,17 @@
node = NULL;
}
- if (node) {
- node = node-next;
- }
-
prefix = sxe-iter.nsprefix;
- while (node nodendx Z_TYPE_P(member)) {
+ while (node nodendx = Z_LVAL_P(member)) {
SKIP_TEXT(node)
if (node-type == XML_ELEMENT_NODE) {
if (match_ns(sxe, node, prefix)) {
if (sxe-iter.type ==
SXE_ITER_ELEMENT !xmlStrcmp(node-name, sxe-iter.name)) {
- nodendx++;
- if (nodendx ==
Z_TYPE_P(member)) {
+ if (nodendx ==
Z_LVAL_P(member)) {
break;
}
+ nodendx++;
}
} else {
break;
@@ -246,9 +242,6 @@
*/
static zval * sxe_dimension_read(zval *object, zval *offset TSRMLS_DC)
{
- if (Z_TYPE_P(offset) == IS_LONG Z_LVAL_P(offset) == 0) {
- return object;
- }
return sxe_prop_dim_read(object, offset, 0, 1, 0 TSRMLS_CC);
}
/* }}} */
@@ -1529,7 +1522,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.119 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.120 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/015.phpt?r1=1.3r2=1.4ty=u
Index: php-src/ext/simplexml/tests/015.phpt
diff -u php-src/ext/simplexml/tests/015.phpt:1.3
php-src/ext/simplexml/tests/015.phpt:1.4
--- php-src/ext/simplexml/tests/015.phpt:1.3Sat Jan 17 14:41:32 2004
+++ php-src/ext/simplexml/tests/015.phptWed Jan 21 06:32:30 2004
@@ -41,15 +41,15 @@
[0]=
string(3) Joe
}
-object(simplexml_element)#3 (1) {
+object(simplexml_element)#4 (1) {
[0]=
string(3) Joe
}
-object(simplexml_element)#2 (1) {
+object(simplexml_element)#1 (1) {
[0]=
string(3) Joe
}
-object(simplexml_element)#2 (1) {
+object(simplexml_element)#1 (1) {
[0]=
string(3) Boe
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 oci8.c
tony2001Wed Jan 21 07:30:07 2004 EDT
Modified files:
/php-src/ext/oci8 oci8.c
Log:
fix potential segfault in oci_lob_write()
change oci_lob_trim() - truncate length should be 0 by default.
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.234r2=1.235ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.234 php-src/ext/oci8/oci8.c:1.235
--- php-src/ext/oci8/oci8.c:1.234 Thu Jan 15 10:06:57 2004
+++ php-src/ext/oci8/oci8.c Wed Jan 21 07:30:05 2004
@@ -22,7 +22,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.234 2004/01/15 15:06:57 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.235 2004/01/21 12:30:05 tony2001 Exp $ */
/* TODO list:
*
@@ -784,7 +784,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.234 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.235 $);
sprintf(buf, %ld, num_persistent);
php_info_print_table_row(2, Active Persistent Links, buf);
@@ -2196,7 +2196,7 @@
}
}
- oci_debug(OCILobGetLen: len=%d,loblen);
+ oci_debug(OCILobGetLen: len=%d,*loblen);
return 0;
}
@@ -4221,6 +4221,7 @@
}
if (zend_get_parameters_ex(2, data, length) == SUCCESS) {
+ convert_to_string_ex(data);
convert_to_long_ex(length);
write_length = Z_LVAL_PP(length);
} else if (zend_get_parameters_ex(1, data) == SUCCESS) {
@@ -4389,7 +4390,7 @@
convert_to_long_ex(length);
trim_length = Z_LVAL_PP(length);
} else {
- WRONG_PARAM_COUNT;
+ trim_length = 0;
}
if (trim_length 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c /ext/simplexml/tests profile10.phpt
rrichards Wed Jan 21 09:04:47 2004 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
/php-src/ext/simplexml/testsprofile10.phpt
Log:
Fix namespace regression bug
Read attributes correctly
Update sxe_prop_dim_exists logic
Update profile
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.120r2=1.121ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.120 php-src/ext/simplexml/simplexml.c:1.121
--- php-src/ext/simplexml/simplexml.c:1.120 Wed Jan 21 06:32:29 2004
+++ php-src/ext/simplexml/simplexml.c Wed Jan 21 09:04:46 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.120 2004/01/21 11:32:29 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.121 2004/01/21 14:04:46 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -117,7 +117,7 @@
static inline int
match_ns(php_sxe_object *sxe, xmlNodePtr node, xmlChar *name)
{
- if (name == NULL (node-ns == NULL || node-ns-href == NULL)) {
+ if (name == NULL (node-ns == NULL || node-ns-prefix == NULL)) {
return 1;
}
@@ -145,7 +145,7 @@
sxe = php_sxe_fetch_object(object TSRMLS_CC);
if (Z_TYPE_P(member) == IS_LONG) {
- if (sxe-iter.type != SXE_ITER_ATTR) {
+ if (sxe-iter.type != SXE_ITER_ATTRLIST) {
attribs = 0;
elements = 1;
}
@@ -165,20 +165,36 @@
GET_NODE(sxe, node);
- if (sxe-iter.type != SXE_ITER_CHILD) {
+ if (sxe-iter.type != SXE_ITER_CHILD sxe-iter.type != SXE_ITER_ATTRLIST) {
node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
}
if (node) {
if (attribs) {
-
- attr = node-properties;
- while (attr) {
- if (!xmlStrcmp(attr-name, name) match_ns(sxe,
(xmlNodePtr) attr, sxe-iter.nsprefix)) {
- _node_as_zval(sxe, (xmlNodePtr) attr,
return_value, SXE_ITER_NONE, NULL, NULL TSRMLS_CC);
- break;
+ if (Z_TYPE_P(member) == IS_LONG sxe-iter.type !=
SXE_ITER_ATTRLIST) {
+ attr = NULL;
+ } else {
+ attr = node-properties;
+ if (Z_TYPE_P(member) == IS_LONG) {
+ while (attr nodendx = Z_LVAL_P(member)) {
+ if (match_ns(sxe, (xmlNodePtr) attr,
sxe-iter.nsprefix)) {
+ if (nodendx ==
Z_LVAL_P(member)) {
+ _node_as_zval(sxe,
(xmlNodePtr) attr, return_value, SXE_ITER_NONE, NULL, NULL TSRMLS_CC);
+ break;
+ }
+ nodendx++;
+ }
+ attr = attr-next;
+ }
+ } else {
+ while (attr) {
+ if (!xmlStrcmp(attr-name, name)
match_ns(sxe, (xmlNodePtr) attr, sxe-iter.nsprefix)) {
+ _node_as_zval(sxe,
(xmlNodePtr) attr, return_value, SXE_ITER_NONE, NULL, NULL TSRMLS_CC);
+ break;
+ }
+ attr = attr-next;
+ }
}
- attr = attr-next;
}
}
@@ -414,12 +430,17 @@
xmlNodePtr node;
xmlAttrPtr attr = NULL;
int exists = 0;
+ int nodendx = 0;
sxe = php_sxe_fetch_object(object TSRMLS_CC);
name = Z_STRVAL_P(member);
GET_NODE(sxe, node);
+ if (sxe-iter.type != SXE_ITER_CHILD sxe-iter.type != SXE_ITER_ATTRLIST) {
+ node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
+ }
+
if (node) {
if (attribs) {
attr = node-properties;
@@ -434,16 +455,32 @@
}
if (elements) {
- node = node-children;
- while (node) {
- SKIP_TEXT(node);
-
- if (!xmlStrcmp(node-name, name)) {
-
[PHP-CVS] cvs: php-src /ext/oci8 oci8.c
tony2001Wed Jan 21 11:18:59 2004 EDT
Modified files:
/php-src/ext/oci8 oci8.c
Log:
*change constant name, coz it doesn't comply with others
*add constant's alias, coz others do have aliases
*change protos (oops =))
*add notices to collection functions
*change coll_element_get coll_assign to inform user, that this type of element is
not supported yet.
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.235r2=1.236ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.235 php-src/ext/oci8/oci8.c:1.236
--- php-src/ext/oci8/oci8.c:1.235 Wed Jan 21 07:30:05 2004
+++ php-src/ext/oci8/oci8.c Wed Jan 21 11:18:58 2004
@@ -22,7 +22,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.235 2004/01/21 12:30:05 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.236 2004/01/21 16:18:58 tony2001 Exp $ */
/* TODO list:
*
@@ -683,7 +683,8 @@
REGISTER_LONG_CONSTANT(SQLT_RDD,SQLT_RDD, CONST_CS | CONST_PERSISTENT);
#ifdef PHP_OCI8_HAVE_COLLECTIONS
- REGISTER_LONG_CONSTANT(OCI_B_SQLT_NTY,SQLT_NTY, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(OCI_B_NTY,SQLT_NTY, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(SQLT_NTY,SQLT_NTY, CONST_CS | CONST_PERSISTENT);
REGISTER_STRING_CONSTANT(OCI_SYSDATE,SYSDATE,CONST_PERSISTENT);
#endif
@@ -784,7 +785,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.235 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.236 $);
sprintf(buf, %ld, num_persistent);
php_info_print_table_row(2, Active Persistent Links, buf);
@@ -5734,7 +5735,7 @@
}
/* }}} */
-/* {{{ proto object oci_fetch_row( resource stmt )
+/* {{{ proto array oci_fetch_row( resource stmt )
Fetch a result row as an enumerated array */
PHP_FUNCTION(oci_fetch_row)
{
@@ -5742,7 +5743,7 @@
}
/* }}} */
-/* {{{ proto object oci_fetch_assoc( resource stmt )
+/* {{{ proto array oci_fetch_assoc( resource stmt )
Fetch a result row as an associative array */
PHP_FUNCTION(oci_fetch_assoc)
{
@@ -5750,7 +5751,7 @@
}
/* }}} */
-/* {{{ proto object oci_fetch_array( resource stmt [, int mode ])
+/* {{{ proto array oci_fetch_array( resource stmt [, int mode ])
Fetch a result row as an array */
PHP_FUNCTION(oci_fetch_array)
{
@@ -6438,9 +6439,14 @@
RETURN_TRUE;
break;
+ default:
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, Unknown or
unsupported type of element);
+ RETURN_FALSE;
+ break;
}
}
-
+
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, oci_collection_append() should not
be called like this. Use $collection-append($element) to append an element to the
collection);
RETURN_FALSE;
}
/* }}} */
@@ -6552,9 +6558,14 @@
}
RETURN_DOUBLE(dnum);
break;
+ default:
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, Unknown or
unsupported type of element);
+ RETURN_FALSE;
+ break;
}
}
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, oci_collection_element_get()
should not be called like this. Use $collection-getelem($index) to get an element of
the collection with the given index);
RETURN_FALSE;
}
/* }}} */
@@ -6599,6 +6610,7 @@
RETURN_TRUE;
}
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, oci_collection_assign() should not
be called like this. Use $collection-assign($collection_value) to assign value to the
collection);
RETURN_FALSE;
}
/* }}} */
@@ -6782,6 +6794,8 @@
break;
}
}
+
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, oci_collection_element_assign()
should not be called like this. Use $collection-assignelem($index, $value) to assign
value to an element of the collection);
RETURN_FALSE;
}
/* }}} */
@@ -6818,6 +6832,8 @@
RETURN_LONG(sz);
}
+
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, oci_collection_size() should not
be called like this. Use $collection-size() to get size of the collection);
RETURN_FALSE;
}
/* }}} */
@@ -6839,6 +6855,8 @@
RETURN_LONG(sz);
}
+
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, oci_collection_max() should not be
called like this. Use $collection-max() to get maximum number of elements in the
collection);
RETURN_FALSE;
}
/* }}} */
@@ -6875,6 +6893,8 @@
}
RETURN_TRUE;
}
[PHP-CVS] cvs: php-src / CODING_STANDARDS
helly Wed Jan 21 15:18:10 2004 EDT Modified files: /php-srcCODING_STANDARDS Log: All technical reasons that prevented us from studlyCaps are solved and all current extensions as well as the whole PEAR framework follow this rule. So for consistency i readd it. # Also we had the discussion onece and decided for this. # Lookup the archieves http://cvs.php.net/diff.php/php-src/CODING_STANDARDS?r1=1.27r2=1.28ty=u Index: php-src/CODING_STANDARDS diff -u php-src/CODING_STANDARDS:1.27 php-src/CODING_STANDARDS:1.28 --- php-src/CODING_STANDARDS:1.27 Wed Dec 3 04:12:38 2003 +++ php-src/CODING_STANDARDSWed Jan 21 15:18:09 2004 @@ -133,7 +133,22 @@ [5] Variable names should be in lowercase. Use underscores to separate between words. -[6] Classes should be given descriptive names. Avoid using abbreviations +[6] Method names follow the 'studlyCaps' (also referred to as 'bumpy case' +or 'camel caps') naming convention, with care taken to minimize the +letter count. The initial letter of the name is lowercase, and each +letter that starts a new 'word' is capitalized. + +Good: +'connect()' +'getData()' +'buildSomeWidget()' + +Bad: +'get_Data()' +'buildsomewidget' +'getI()' + +[7] Classes should be given descriptive names. Avoid using abbreviations where possible. Each word in the class name should start with a capital letter, with words underscore delimited. The class name should be prefixed with the name of the 'parent set'. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard exec.c
No MFH?
--Jani
On Wed, 21 Jan 2004, Ilia Alshanetsky wrote:
iliaa Wed Jan 21 11:57:14 2004 EDT
Modified files:
/php-src NEWS
/php-src/ext/standard exec.c
Log:
Fixed bug #26938 (exec() has problems reading long lines).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1585r2=1.1586ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1585 php-src/NEWS:1.1586
--- php-src/NEWS:1.1585Wed Jan 21 05:20:45 2004
+++ php-src/NEWS Wed Jan 21 11:57:12 2004
@@ -9,6 +9,8 @@
(Derick)
- Fixed problems with longlong values in mysqli. (Georg)
- Fixed class name case preserving of user defined classes. (Marcus)
+- Fixed bug #26938 (exec() has problems reading long lines).
+ (Ilia, runekl[at]opoint[dot]com
- Fixed bug #26947 (ext/dom: Crash when using DomDocument::getElementById()).
(Christian)
- Fixed bug #26911 (crash in sqlite extension when fetching data from empty
http://cvs.php.net/diff.php/php-src/ext/standard/exec.c?r1=1.108r2=1.109ty=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.108 php-src/ext/standard/exec.c:1.109
--- php-src/ext/standard/exec.c:1.108 Thu Jan 8 03:17:31 2004
+++ php-src/ext/standard/exec.cWed Jan 21 11:57:13 2004
@@ -16,7 +16,7 @@
| Ilia Alshanetsky [EMAIL PROTECTED] |
+--+
*/
-/* $Id: exec.c,v 1.108 2004/01/08 08:17:31 andi Exp $ */
+/* $Id: exec.c,v 1.109 2004/01/21 16:57:13 iliaa Exp $ */
#include stdio.h
#include php.h
@@ -125,7 +125,7 @@
}
continue;
} else if (b != buf) {
- bufl += buflen - EXEC_INPUT_BUF;
+ bufl += b - buf;
}
if (type == 1) {
--
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_doubled.phpt
helly Wed Jan 21 17:36:50 2004 EDT
Modified files:
/php-src/tests/classes interface_doubled.phpt
Log:
Change to correct syntax.
# The test will still fail though.
http://cvs.php.net/diff.php/php-src/tests/classes/interface_doubled.phpt?r1=1.5r2=1.6ty=u
Index: php-src/tests/classes/interface_doubled.phpt
diff -u php-src/tests/classes/interface_doubled.phpt:1.5
php-src/tests/classes/interface_doubled.phpt:1.6
--- php-src/tests/classes/interface_doubled.phpt:1.5Sun Nov 30 08:57:18 2003
+++ php-src/tests/classes/interface_doubled.phptWed Jan 21 17:36:49 2004
@@ -13,11 +13,11 @@
abstract function f_b();
}
-interface if_c implements if_a, if_b {
+interface if_c extends if_a, if_b {
abstract function f_c();
}
-interface if_d extends if_a implements if_b {
+interface if_d extends if_a, if_b {
abstract function f_d();
}
@@ -25,7 +25,7 @@
abstract function f_d();
}
-interface if_f extends if_e implements if_a, if_b, if_c, if_d, if_e {
+interface if_f extends if_e, if_a, if_b, if_c, if_d, if_e {
}
class base {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard exec.c
No need. According to my tests the bug is specific to PHP5, which uses new
code to fetch the data from executed binary.
Ilia
On January 21, 2004 05:32 pm, Jani Taskinen wrote:
No MFH?
--Jani
On Wed, 21 Jan 2004, Ilia Alshanetsky wrote:
iliaaWed Jan 21 11:57:14 2004 EDT
Modified files:
/php-src NEWS
/php-src/ext/standardexec.c
Log:
Fixed bug #26938 (exec() has problems reading long lines).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1585r2=1.1586ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1585 php-src/NEWS:1.1586
--- php-src/NEWS:1.1585 Wed Jan 21 05:20:45 2004
+++ php-src/NEWS Wed Jan 21 11:57:12 2004
@@ -9,6 +9,8 @@
(Derick)
- Fixed problems with longlong values in mysqli. (Georg)
- Fixed class name case preserving of user defined classes. (Marcus)
+- Fixed bug #26938 (exec() has problems reading long lines).
+ (Ilia, runekl[at]opoint[dot]com
- Fixed bug #26947 (ext/dom: Crash when using
DomDocument::getElementById()). (Christian)
- Fixed bug #26911 (crash in sqlite extension when fetching data from
empty
http://cvs.php.net/diff.php/php-src/ext/standard/exec.c?r1=1.108r2=1.109
ty=u Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.108
php-src/ext/standard/exec.c:1.109 ---
php-src/ext/standard/exec.c:1.108 Thu Jan 8 03:17:31 2004
+++ php-src/ext/standard/exec.c Wed Jan 21 11:57:13 2004
@@ -16,7 +16,7 @@
| Ilia Alshanetsky [EMAIL PROTECTED]
| |
+--+
*/
-/* $Id: exec.c,v 1.108 2004/01/08 08:17:31 andi Exp $ */
+/* $Id: exec.c,v 1.109 2004/01/21 16:57:13 iliaa Exp $ */
#include stdio.h
#include php.h
@@ -125,7 +125,7 @@
}
continue;
} else if (b != buf) {
-bufl += buflen - EXEC_INPUT_BUF;
+bufl += b - buf;
}
if (type == 1) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard exec.c
Should I update the test case to the one from #26938 ?
--Jani
On Wed, 21 Jan 2004, Ilia Alshanetsky wrote:
No need. According to my tests the bug is specific to PHP5, which uses new
code to fetch the data from executed binary.
Ilia
On January 21, 2004 05:32 pm, Jani Taskinen wrote:
No MFH?
--Jani
On Wed, 21 Jan 2004, Ilia Alshanetsky wrote:
iliaa Wed Jan 21 11:57:14 2004 EDT
Modified files:
/php-srcNEWS
/php-src/ext/standard exec.c
Log:
Fixed bug #26938 (exec() has problems reading long lines).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1585r2=1.1586ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1585 php-src/NEWS:1.1586
--- php-src/NEWS:1.1585 Wed Jan 21 05:20:45 2004
+++ php-src/NEWSWed Jan 21 11:57:12 2004
@@ -9,6 +9,8 @@
(Derick)
- Fixed problems with longlong values in mysqli. (Georg)
- Fixed class name case preserving of user defined classes. (Marcus)
+- Fixed bug #26938 (exec() has problems reading long lines).
+ (Ilia, runekl[at]opoint[dot]com
- Fixed bug #26947 (ext/dom: Crash when using
DomDocument::getElementById()). (Christian)
- Fixed bug #26911 (crash in sqlite extension when fetching data from
empty
http://cvs.php.net/diff.php/php-src/ext/standard/exec.c?r1=1.108r2=1.109
ty=u Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.108
php-src/ext/standard/exec.c:1.109 ---
php-src/ext/standard/exec.c:1.108 Thu Jan 8 03:17:31 2004
+++ php-src/ext/standard/exec.c Wed Jan 21 11:57:13 2004
@@ -16,7 +16,7 @@
| Ilia Alshanetsky [EMAIL PROTECTED]
| |
+--+
*/
-/* $Id: exec.c,v 1.108 2004/01/08 08:17:31 andi Exp $ */
+/* $Id: exec.c,v 1.109 2004/01/21 16:57:13 iliaa Exp $ */
#include stdio.h
#include php.h
@@ -125,7 +125,7 @@
}
continue;
} else if (b != buf) {
- bufl += buflen - EXEC_INPUT_BUF;
+ bufl += b - buf;
}
if (type == 1) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file bug26938.phpt
sniper Wed Jan 21 17:48:28 2004 EDT
Added files:
/php-src/ext/standard/tests/filebug26938.phpt
Log:
test case for bug #26938
http://cvs.php.net/co.php/php-src/ext/standard/tests/file/bug26938.phpt?r=1.1p=1
Index: php-src/ext/standard/tests/file/bug26938.phpt
+++ php-src/ext/standard/tests/file/bug26938.phpt
--TEST--
Bug #26938 (exec does not read consecutive long lines correctly)
--FILE--
?php
$out = array();
$status = -1;
$php = getenv('TEST_PHP_EXECUTABLE');
exec($php . ' -r \''
. '$lengths = array(10,2,1,5,1,3);'
. 'foreach($lengths as $length) {'
. ' for($i=0;$i$length;$i++) print chr(65+$i % 27);'
. ' print \n;'
. '}\'', $out, $status);
for ($i=0;$i6;$i++)
print md5(line $i)= . md5($out[$i]) . (length .
strlen($out[$i]) . )\n;
?
--EXPECT--
md5(line 0)= e86410fa2d6e2634fd8ac5f4b3afe7f3 (length 10)
md5(line 1)= e84debf3a1d132871d7fe45c1c04c566 (length 2)
md5(line 2)= c33b4d2f86908eea5d75ee5a61fd81f4 (length 1)
md5(line 3)= 2ecdde3959051d913f61b14579ea136d (length 5)
md5(line 4)= c33b4d2f86908eea5d75ee5a61fd81f4 (length 1)
md5(line 5)= 902fbdd2b1df0c4f70b4a5d23525e932 (length 3)
--
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/standard/tests/file bug26938.phpt
sniper Wed Jan 21 17:50:33 2004 EDT
Added files: (Branch: PHP_4_3)
/php-src/ext/standard/tests/filebug26938.phpt
Log:
MFH
http://cvs.php.net/co.php/php-src/ext/standard/tests/file/bug26938.phpt?r=1.1p=1
Index: php-src/ext/standard/tests/file/bug26938.phpt
+++ php-src/ext/standard/tests/file/bug26938.phpt
--TEST--
Bug #26938 (exec does not read consecutive long lines correctly)
--FILE--
?php
$out = array();
$status = -1;
$php = getenv('TEST_PHP_EXECUTABLE');
exec($php . ' -r \''
. '$lengths = array(10,2,1,5,1,3);'
. 'foreach($lengths as $length) {'
. ' for($i=0;$i$length;$i++) print chr(65+$i % 27);'
. ' print \n;'
. '}\'', $out, $status);
for ($i=0;$i6;$i++)
print md5(line $i)= . md5($out[$i]) . (length .
strlen($out[$i]) . )\n;
?
--EXPECT--
md5(line 0)= e86410fa2d6e2634fd8ac5f4b3afe7f3 (length 10)
md5(line 1)= e84debf3a1d132871d7fe45c1c04c566 (length 2)
md5(line 2)= c33b4d2f86908eea5d75ee5a61fd81f4 (length 1)
md5(line 3)= 2ecdde3959051d913f61b14579ea136d (length 5)
md5(line 4)= c33b4d2f86908eea5d75ee5a61fd81f4 (length 1)
md5(line 5)= 902fbdd2b1df0c4f70b4a5d23525e932 (length 3)
--
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/standard fsock.c
sniper Wed Jan 21 22:25:38 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/standard fsock.c Log: Nuke unused variable http://cvs.php.net/diff.php/php-src/ext/standard/fsock.c?r1=1.106.2.12r2=1.106.2.13ty=u Index: php-src/ext/standard/fsock.c diff -u php-src/ext/standard/fsock.c:1.106.2.12 php-src/ext/standard/fsock.c:1.106.2.13 --- php-src/ext/standard/fsock.c:1.106.2.12 Sat Dec 20 15:24:36 2003 +++ php-src/ext/standard/fsock.cWed Jan 21 22:25:37 2004 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: fsock.c,v 1.106.2.12 2003/12/20 20:24:36 wez Exp $ */ +/* $Id: fsock.c,v 1.106.2.13 2004/01/22 03:25:37 sniper Exp $ */ /* converted to PHP Streams and moved much code to main/network.c [wez] */ @@ -95,10 +95,6 @@ #include php_network.h -#ifdef ZTS -static int fsock_globals_id; -#endif - #ifdef PHP_WIN32 #define EWOULDBLOCK WSAEWOULDBLOCK #elif defined(NETWARE) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
