[PHP-CVS] cvs: php-src /ext/dba dba_flatfile.c /ext/dba/libinifile inifile.c
helly Wed Dec 17 03:50:51 2003 EDT
Modified files:
/php-src/ext/dbadba_flatfile.c
/php-src/ext/dba/libinifile inifile.c
Log:
Fix warnings
Index: php-src/ext/dba/dba_flatfile.c
diff -u php-src/ext/dba/dba_flatfile.c:1.15 php-src/ext/dba/dba_flatfile.c:1.16
--- php-src/ext/dba/dba_flatfile.c:1.15 Tue Dec 16 16:40:19 2003
+++ php-src/ext/dba/dba_flatfile.c Wed Dec 17 03:50:50 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dba_flatfile.c,v 1.15 2003/12/16 21:40:19 helly Exp $ */
+/* $Id: dba_flatfile.c,v 1.16 2003/12/17 08:50:50 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -41,7 +41,10 @@
DBA_OPEN_FUNC(flatfile)
{
- int fd, flags;
+ int fd;
+#ifdef F_SETFL
+ int flags;
+#endif
if (info-mode != DBA_READER) {
if (SUCCESS != php_stream_cast(info-fp, PHP_STREAM_AS_FD, (void*)fd,
1)) {
Index: php-src/ext/dba/libinifile/inifile.c
diff -u php-src/ext/dba/libinifile/inifile.c:1.10
php-src/ext/dba/libinifile/inifile.c:1.11
--- php-src/ext/dba/libinifile/inifile.c:1.10 Sun Dec 14 17:07:29 2003
+++ php-src/ext/dba/libinifile/inifile.cWed Dec 17 03:50:50 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: inifile.c,v 1.10 2003/12/14 22:07:29 helly Exp $ */
+/* $Id: inifile.c,v 1.11 2003/12/17 08:50:50 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -43,7 +43,7 @@
/* {{{ inifile_version */
char *inifile_version()
{
- return 1.0, $Revision: 1.10 $;
+ return 1.0, $Revision: 1.11 $;
}
/* }}} */
@@ -500,7 +500,7 @@
ret = FAILURE;
} else {
php_stream_seek(dba-fp, 0, SEEK_END);
- if (pos_grp_next != php_stream_tell(dba-fp)) {
+ if (pos_grp_next != (size_t)php_stream_tell(dba-fp)) {
php_stream_seek(dba-fp, pos_grp_next, SEEK_SET);
if (!php_stream_copy_to_stream(dba-fp, fp_tmp,
PHP_STREAM_COPY_ALL)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
Could not copy remainder to temporary stream);
--
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/dba dba_flatfile.c /ext/dba/libinifile inifile.c
helly Wed Dec 17 04:02:08 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/dbadba_flatfile.c
/php-src/ext/dba/libinifile inifile.c
Log:
MFH: Fix warnings
Index: php-src/ext/dba/dba_flatfile.c
diff -u php-src/ext/dba/dba_flatfile.c:1.8.2.5 php-src/ext/dba/dba_flatfile.c:1.8.2.6
--- php-src/ext/dba/dba_flatfile.c:1.8.2.5 Tue Dec 16 16:41:57 2003
+++ php-src/ext/dba/dba_flatfile.c Wed Dec 17 04:02:06 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dba_flatfile.c,v 1.8.2.5 2003/12/16 21:41:57 helly Exp $ */
+/* $Id: dba_flatfile.c,v 1.8.2.6 2003/12/17 09:02:06 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -41,7 +41,10 @@
DBA_OPEN_FUNC(flatfile)
{
- int fd, flags;
+ int fd;
+#ifdef F_SETFL
+ int flags;
+#endif
if (info-mode != DBA_READER) {
if (SUCCESS != php_stream_cast(info-fp, PHP_STREAM_AS_FD, (void*)fd,
1)) {
Index: php-src/ext/dba/libinifile/inifile.c
diff -u php-src/ext/dba/libinifile/inifile.c:1.6.2.2
php-src/ext/dba/libinifile/inifile.c:1.6.2.3
--- php-src/ext/dba/libinifile/inifile.c:1.6.2.2Wed Jul 16 16:56:06 2003
+++ php-src/ext/dba/libinifile/inifile.cWed Dec 17 04:02:07 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: inifile.c,v 1.6.2.2 2003/07/16 20:56:06 helly Exp $ */
+/* $Id: inifile.c,v 1.6.2.3 2003/12/17 09:02:07 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -44,7 +44,7 @@
/* {{{ inifile_version */
char *inifile_version()
{
- return 1.0, $Revision: 1.6.2.2 $;
+ return 1.0, $Revision: 1.6.2.3 $;
}
/* }}} */
@@ -499,7 +499,7 @@
ret = FAILURE;
} else {
php_stream_seek(dba-fp, 0, SEEK_END);
- if (pos_grp_next != php_stream_tell(dba-fp)) {
+ if (pos_grp_next != (size_t)php_stream_tell(dba-fp)) {
php_stream_seek(dba-fp, pos_grp_next, SEEK_SET);
if (!php_stream_copy_to_stream(dba-fp, fp_tmp,
PHP_STREAM_COPY_ALL)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
Could not copy remainder to temporary stream);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/exif exif.c
helly Wed Dec 17 04:07:13 2003 EDT
Modified files:
/php-src/ext/exif exif.c
Log:
Fix warning
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.159 php-src/ext/exif/exif.c:1.160
--- php-src/ext/exif/exif.c:1.159 Wed Dec 10 16:23:33 2003
+++ php-src/ext/exif/exif.c Wed Dec 17 04:07:11 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.159 2003/12/10 21:23:33 iliaa Exp $ */
+/* $Id: exif.c,v 1.160 2003/12/17 09:07:11 helly Exp $ */
/* ToDos
*
@@ -111,7 +111,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.159 2003/12/10 21:23:33 iliaa Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.160 2003/12/17 09:07:11 helly Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -1628,7 +1628,7 @@
} else {
info_value = info_data-value;
}
- for (idex=0,vptr=value; idexlength; idex++,vptr=(char *) vptr
+ php_tiff_bytes_per_format[format]) {
+ for (idex=0,vptr=value; idex(size_t)length; idex++,vptr=(char
*) vptr + php_tiff_bytes_per_format[format]) {
if (length1) {
info_value = info_data-value.list[idex];
}
--
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/exif exif.c
helly Wed Dec 17 04:08:39 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/exif exif.c
Log:
MFH: Fix warning
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.118.2.26 php-src/ext/exif/exif.c:1.118.2.27
--- php-src/ext/exif/exif.c:1.118.2.26 Sat Nov 8 09:16:14 2003
+++ php-src/ext/exif/exif.c Wed Dec 17 04:08:37 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.118.2.26 2003/11/08 14:16:14 helly Exp $ */
+/* $Id: exif.c,v 1.118.2.27 2003/12/17 09:08:37 helly Exp $ */
/* ToDos
*
@@ -99,7 +99,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.118.2.26 2003/11/08 14:16:14 helly Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.118.2.27 2003/12/17 09:08:37 helly Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -1606,7 +1606,7 @@
} else {
info_value = info_data-value;
}
- for (idex=0,vptr=value; idexlength; idex++,vptr=(char *) vptr
+ php_tiff_bytes_per_format[format]) {
+ for (idex=0,vptr=value; idex(size_t)length; idex++,vptr=(char
*) vptr + php_tiff_bytes_per_format[format]) {
if (length1) {
info_value = info_data-value.list[idex];
}
--
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
rrichards Wed Dec 17 05:28:30 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
free nodes correctly to clear node proxies
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.94 php-src/ext/simplexml/simplexml.c:1.95
--- php-src/ext/simplexml/simplexml.c:1.94 Tue Dec 16 15:40:24 2003
+++ php-src/ext/simplexml/simplexml.c Wed Dec 17 05:28:29 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.94 2003/12/16 20:40:24 helly Exp $ */
+/* $Id: simplexml.c,v 1.95 2003/12/17 10:28:29 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -480,7 +480,7 @@
anext = attr-next;
if (!xmlStrcmp(attr-name, Z_STRVAL_P(member))) {
xmlUnlinkNode((xmlNodePtr) attr);
- xmlFreeProp(attr);
+ php_libxml_node_free_resource((xmlNodePtr)
attr TSRMLS_CC);
}
attr = anext;
}
@@ -495,7 +495,7 @@
if (!xmlStrcmp(node-name, Z_STRVAL_P(member))) {
xmlUnlinkNode(node);
- xmlFreeNode(node);
+ php_libxml_node_free_resource(node TSRMLS_CC);
}
next_iter:
@@ -1587,7 +1587,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.94 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.95 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dl.c /win32 winutil.c
helly Wed Dec 17 06:20:36 2003 EDT
Modified files:
/php-src/ext/standard dl.c
/php-src/win32 winutil.c
Log:
Fix a memleak: A second call to *nix version of dlerror() frees the error
string. This behavior is also adapted to the win build so that the buffer
returned by FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER) can be freed too.
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.84 php-src/ext/standard/dl.c:1.85
--- php-src/ext/standard/dl.c:1.84 Sun Aug 17 05:57:21 2003
+++ php-src/ext/standard/dl.c Wed Dec 17 06:20:35 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dl.c,v 1.84 2003/08/17 09:57:21 david Exp $ */
+/* $Id: dl.c,v 1.85 2003/12/17 11:20:35 helly Exp $ */
#include php.h
#include dl.h
@@ -141,6 +141,7 @@
handle = DL_LOAD(libpath);
if (!handle) {
php_error_docref(NULL TSRMLS_CC, error_type, Unable to load dynamic
library '%s' - %s, libpath, GET_DL_ERROR());
+ GET_DL_ERROR(); /* free the buffer storing the error */
efree(libpath);
RETURN_FALSE;
}
Index: php-src/win32/winutil.c
diff -u php-src/win32/winutil.c:1.10 php-src/win32/winutil.c:1.11
--- php-src/win32/winutil.c:1.10Tue Jun 10 16:03:46 2003
+++ php-src/win32/winutil.c Wed Dec 17 06:20:35 2003
@@ -20,8 +20,12 @@
PHPAPI char *php_win_err(int error)
{
- char *buf;
+ static char *buf = NULL;
+ if (buf) {
+ free(buf);
+ buf = NULL;
+ }
FormatMessage(
FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)buf,
0, NULL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml/tests 014.phpt 015.phpt 016.phpt
dmitry Wed Dec 17 09:49:10 2003 EDT Added files: /php-src/ext/simplexml/tests014.phpt 015.phpt 016.phpt Log: Index: php-src/ext/simplexml/tests/014.phpt +++ php-src/ext/simplexml/tests/014.phpt --TEST-- SimpleXML: adding/removing attributes --SKIPIF-- ?php if (!extension_loaded(simplexml)) print skip; ? --FILE-- ?php $xml =EOF people person name=Joe/person person name=Boe/person /people EOF; $people = simplexml_load_string($xml); var_dump($people-person[0]['name']); var_dump($people-person[0]['age']); $people-person[0]['name'] = XXX; $people-person[0]['age'] = 30; var_dump($people-person[0]['name']); var_dump($people-person[0]['age']); $people-person[0]['age'] += 5; var_dump($people-person[0]['age']); unset($people-person[0]['age']); var_dump($people-person[0]['age']); var_dump(isset($people-person[0]['age'])); echo ---Done---\n; ? --EXPECT-- string(3) Joe NULL string(3) XXX string(2) 30 string(2) 35 NULL bool(false) ---Done--- Index: php-src/ext/simplexml/tests/015.phpt +++ php-src/ext/simplexml/tests/015.phpt --TEST-- SimpleXML: accessing singular subnode as array --SKIPIF-- ?php if (!extension_loaded(simplexml)) print skip; ? --FILE-- ?php $xml =EOF people person name=Joe/person /people EOF; $people = simplexml_load_string($xml); var_dump($people-person['name']); var_dump($people-person[0]['name']); $people-person['name'] = XXX; var_dump($people-person['name']); var_dump($people-person[0]['name']); $people-person[0]['name'] = YYY; var_dump($people-person['name']); var_dump($people-person[0]['name']); unset($people-person[0]['name']); var_dump($people-person['name']); var_dump($people-person[0]['name']); var_dump(isset($people-person['name'])); var_dump(isset($people-person[0]['name'])); echo ---Done---\n; ? --EXPECT-- string(3) Joe string(3) Joe string(3) XXX string(3) XXX string(3) YYY string(3) YYY NULL NULL bool(false) bool(false) ---Done--- Index: php-src/ext/simplexml/tests/016.phpt +++ php-src/ext/simplexml/tests/016.phpt --TEST-- SimpleXML: modifying attributes of singular subnode --SKIPIF-- ?php if (!extension_loaded(simplexml)) print skip; ? --FILE-- ?php $xml =EOF people person name=Joe/person /people EOF; $people = simplexml_load_string($xml); var_dump($people-person['name']); var_dump($people-person[0]['name']); $people-person[0]['name'] .= ZZZ; var_dump($people-person['name']); var_dump($people-person[0]['name']); echo ---Done---\n; ? --EXPECT-- string(3) Joe string(3) Joe string(3) JoeZZZ string(3) JoeZZZ ---Done--- -- 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 015.phpt
dmitry Wed Dec 17 10:06:41 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
/php-src/ext/simplexml/tests015.phpt
Log:
accessing singular subnode as array
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.95 php-src/ext/simplexml/simplexml.c:1.96
--- php-src/ext/simplexml/simplexml.c:1.95 Wed Dec 17 05:28:29 2003
+++ php-src/ext/simplexml/simplexml.c Wed Dec 17 10:06:39 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.95 2003/12/17 10:28:29 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.96 2003/12/17 15:06:39 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -243,6 +243,9 @@
*/
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);
}
/* }}} */
@@ -1587,7 +1590,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.95 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.96 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
Index: php-src/ext/simplexml/tests/015.phpt
diff -u php-src/ext/simplexml/tests/015.phpt:1.1
php-src/ext/simplexml/tests/015.phpt:1.2
--- php-src/ext/simplexml/tests/015.phpt:1.1Wed Dec 17 09:49:10 2003
+++ php-src/ext/simplexml/tests/015.phptWed Dec 17 10:06:40 2003
@@ -10,31 +10,35 @@
/people
EOF;
+$xml2 =EOF
+people
+ person name=Joe/person
+ person name=Boe/person
+/people
+EOF;
+
$people = simplexml_load_string($xml);
var_dump($people-person['name']);
var_dump($people-person[0]['name']);
-$people-person['name'] = XXX;
-var_dump($people-person['name']);
-var_dump($people-person[0]['name']);
-$people-person[0]['name'] = YYY;
-var_dump($people-person['name']);
+//$people-person['name'] = XXX;
+//var_dump($people-person['name']);
+//var_dump($people-person[0]['name']);
+//$people-person[0]['name'] = YYY;
+//var_dump($people-person['name']);
+//var_dump($people-person[0]['name']);
+//unset($people-person[0]['name']);
+//var_dump($people-person['name']);
+//var_dump($people-person[0]['name']);
+//var_dump(isset($people-person['name']));
+//var_dump(isset($people-person[0]['name']));
+$people = simplexml_load_string($xml2);
var_dump($people-person[0]['name']);
-unset($people-person[0]['name']);
-var_dump($people-person['name']);
-var_dump($people-person[0]['name']);
-var_dump(isset($people-person['name']));
-var_dump(isset($people-person[0]['name']));
+var_dump($people-person[1]['name']);
echo ---Done---\n;
?
--EXPECT--
string(3) Joe
string(3) Joe
-string(3) XXX
-string(3) XXX
-string(3) YYY
-string(3) YYY
-NULL
-NULL
-bool(false)
-bool(false)
+string(3) Joe
+string(3) Boe
---Done---
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug22510.phpt
iliaa Wed Dec 17 12:25:00 2003 EDT Modified files: /php-src/tests/lang bug22510.phpt Log: Update test. Index: php-src/tests/lang/bug22510.phpt diff -u php-src/tests/lang/bug22510.phpt:1.4 php-src/tests/lang/bug22510.phpt:1.5 --- php-src/tests/lang/bug22510.phpt:1.4Sun Nov 30 08:57:19 2003 +++ php-src/tests/lang/bug22510.phptWed Dec 17 12:25:00 2003 @@ -93,4 +93,31 @@ bar::run1 foo::method1 -Fatal error: Only variables or references can be returned by reference in %s on line %d +Strict Standards: Only variable references should be returned by reference in %s on line %d +foo::method1 + +Strict Standards: Only variable references should be returned by reference in %s on line %d +foo::finalize +done! +ok2 +bar::run2 +foo::method2 +foo::method2 +foo::finalize +done! +ok3 +bar::run3 +foo::method3 +foo::method3 +foo::finalize +done! +ouch +bar::run1 +foo::method1 + +Strict Standards: Only variable references should be returned by reference in %s on line %d +foo::method1 + +Strict Standards: Only variable references should be returned by reference in %s on line %d +foo::finalize +I'm alive! -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom php_dom.c
rrichards Wed Dec 17 13:59:06 2003 EDT
Modified files:
/php-src/ext/domphp_dom.c
Log:
no longer need to cleanup temp var
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.45 php-src/ext/dom/php_dom.c:1.46
--- php-src/ext/dom/php_dom.c:1.45 Tue Dec 16 12:14:06 2003
+++ php-src/ext/dom/php_dom.c Wed Dec 17 13:59:05 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.45 2003/12/16 17:14:06 iliaa Exp $ */
+/* $Id: php_dom.c,v 1.46 2003/12/17 18:59:05 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -267,10 +267,6 @@
}
if (ret == SUCCESS) {
hnd-write_func(obj, value TSRMLS_CC);
- if (! PZVAL_IS_REF(value) value-refcount == 0) {
- value-refcount++;
- zval_ptr_dtor(value);
- }
} else {
std_hnd = zend_get_std_object_handlers();
std_hnd-write_property(object, member, value TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /main php_version.h
andiWed Dec 17 15:20:35 2003 EDT Modified files: /php-srcconfigure.in /php-src/main php_version.h Log: Roll RC1 of B3 Index: php-src/configure.in diff -u php-src/configure.in:1.483 php-src/configure.in:1.484 --- php-src/configure.in:1.483 Thu Dec 4 10:57:55 2003 +++ php-src/configure.inWed Dec 17 15:20:33 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.483 2003/12/04 15:57:55 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.484 2003/12/17 20:20:33 andi Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=5 MINOR_VERSION=0 RELEASE_VERSION=0 -EXTRA_VERSION=b3-dev +EXTRA_VERSION=b3RC1 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.72 php-src/main/php_version.h:1.73 --- php-src/main/php_version.h:1.72 Thu Oct 30 10:14:31 2003 +++ php-src/main/php_version.h Wed Dec 17 15:20:34 2003 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION b3-dev -#define PHP_VERSION 5.0.0b3-dev +#define PHP_EXTRA_VERSION b3RC1 +#define PHP_VERSION 5.0.0b3RC1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in /main php_version.h
On Wed, 17 Dec 2003, Andi Gutmans wrote: andi Wed Dec 17 15:20:35 2003 EDT Modified files: /php-src configure.in /php-src/main php_version.h Log: Roll RC1 of B3 Release candidate? Of Beta release? wtf is that? :) --Jani Index: php-src/configure.in diff -u php-src/configure.in:1.483 php-src/configure.in:1.484 --- php-src/configure.in:1.483 Thu Dec 4 10:57:55 2003 +++ php-src/configure.in Wed Dec 17 15:20:33 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.483 2003/12/04 15:57:55 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.484 2003/12/17 20:20:33 andi Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=5 MINOR_VERSION=0 RELEASE_VERSION=0 -EXTRA_VERSION=b3-dev +EXTRA_VERSION=b3RC1 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.72 php-src/main/php_version.h:1.73 --- php-src/main/php_version.h:1.72Thu Oct 30 10:14:31 2003 +++ php-src/main/php_version.h Wed Dec 17 15:20:34 2003 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION b3-dev -#define PHP_VERSION 5.0.0b3-dev +#define PHP_EXTRA_VERSION b3RC1 +#define PHP_VERSION 5.0.0b3RC1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in /main php_version.h
Always put the version back to the '-dev' after tagging the source, thank you. (I would guess it's supposed to be RC1-dev :) --Jani On Wed, 17 Dec 2003, Andi Gutmans wrote: andi Wed Dec 17 15:20:35 2003 EDT Modified files: /php-src configure.in /php-src/main php_version.h Log: Roll RC1 of B3 Index: php-src/configure.in diff -u php-src/configure.in:1.483 php-src/configure.in:1.484 --- php-src/configure.in:1.483 Thu Dec 4 10:57:55 2003 +++ php-src/configure.in Wed Dec 17 15:20:33 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.483 2003/12/04 15:57:55 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.484 2003/12/17 20:20:33 andi Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=5 MINOR_VERSION=0 RELEASE_VERSION=0 -EXTRA_VERSION=b3-dev +EXTRA_VERSION=b3RC1 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.72 php-src/main/php_version.h:1.73 --- php-src/main/php_version.h:1.72Thu Oct 30 10:14:31 2003 +++ php-src/main/php_version.h Wed Dec 17 15:20:34 2003 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION b3-dev -#define PHP_VERSION 5.0.0b3-dev +#define PHP_EXTRA_VERSION b3RC1 +#define PHP_VERSION 5.0.0b3RC1 -- 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
sniper Wed Dec 17 16:10:29 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: wet Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.507 php-src/NEWS:1.1247.2.508 --- php-src/NEWS:1.1247.2.507 Tue Dec 16 17:14:54 2003 +++ php-src/NEWSWed Dec 17 16:10:23 2003 @@ -6,7 +6,7 @@ (Edin) - Added support for --program-prefix and --program-suffix configure options. (Jani) -- Added warning when unable to create temp stream for ftp_(n)list(). (Sara) +- Added a warning when creating temp stream fails with ftp_(n)list(). (Sara) - Fixed header handler in NSAPI SAPI module (header-replace was ignored, send_default_content_type now sends value from php.ini). (Uwe Schindler) - Fixed bug #26635 (fixed look up for fonts in the current directory w/ZTS). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/oci8 oci8.c php_oci8.h
When you close bugs, you should tell them that they're not fixed in PHP 4..especially when the bugs are reported for PHP 4.. And Harald, you should know by now already that @ in commit message does not work. Edit the NEWS file. (you don't really need to put that long entry about this in it) --Jani On Tue, 16 Dec 2003, Harald Radi wrote: phanto Tue Dec 16 05:29:12 2003 EDT Modified files: /php-src/ext/oci8 oci8.c php_oci8.h Log: @- fixed #20006, #22674 and #24531 (harald) @- added ZTS connection pooling support to the oci extension @ connections will now be pooled per process and not @ per thread anymore. the number of persistent and active @ connections is now also shown in the phpinfo() output (harald) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in /main php_version.h
At 11:07 PM 12/17/2003 +0200, Jani Taskinen wrote: On Wed, 17 Dec 2003, Andi Gutmans wrote: andi Wed Dec 17 15:20:35 2003 EDT Modified files: /php-src configure.in /php-src/main php_version.h Log: Roll RC1 of B3 Release candidate? Of Beta release? wtf is that? :) Last time there was a problem with libtool and other stuff when I rolled the package. I just want to get a sanity version out for half a day just to make sure that the build is OK. Andi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in /main php_version.h
At 11:08 PM 12/17/2003 +0200, Jani Taskinen wrote: Always put the version back to the '-dev' after tagging the source, thank you. (I would guess it's supposed to be RC1-dev :) Jani, relax. We've had this discussion before. Give me enough time to get B3 out before we -dev stuff. I'm keeping it the way it is until I get a thumbs up on the libtool and stuff, and then I'll re-roll as B3 and then we can change it to -dev. Andi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard microtime.c
andrey Wed Dec 17 17:03:34 2003 EDT
Modified files:
/php-src/ext/standard microtime.c
Log:
Added optional parameter to microtime so now it can return float if it
the user wants. This prevents from getting string representation exploding
it and then creating a float.
Index: php-src/ext/standard/microtime.c
diff -u php-src/ext/standard/microtime.c:1.41 php-src/ext/standard/microtime.c:1.42
--- php-src/ext/standard/microtime.c:1.41 Tue Jun 10 16:03:38 2003
+++ php-src/ext/standard/microtime.cWed Dec 17 17:03:33 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: microtime.c,v 1.41 2003/06/10 20:03:38 imajes Exp $ */
+/* $Id: microtime.c,v 1.42 2003/12/17 22:03:33 andrey Exp $ */
#include php.h
@@ -51,29 +51,40 @@
#define MICRO_IN_SEC 100.00
#define SEC_IN_MIN 60
-/* {{{ proto string microtime(void)
- Returns a string containing the current time in seconds and microseconds */
#ifdef HAVE_GETTIMEOFDAY
+/* {{{ proto string microtime([bool get_as_float])
+ Returns either a string or a float containing the current time in seconds and
microseconds */
PHP_FUNCTION(microtime)
{
struct timeval tp;
long sec = 0L;
double msec = 0.0;
- char ret[100];
-
+ zend_bool get_as_float = 0;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |b, get_as_float) ==
FAILURE) {
+ return;
+ }
+
if (gettimeofday((struct timeval *) tp, (NUL)) == 0) {
msec = (double) (tp.tv_usec / MICRO_IN_SEC);
sec = tp.tv_sec;
if (msec = 1.0) msec -= (long) msec;
- snprintf(ret, 100, %.8f %ld, msec, sec);
- RETVAL_STRING(ret,1);
+ if (get_as_float == 0) {
+ char ret[100];
+
+ snprintf(ret, 100, %.8f %ld, msec, sec);
+ RETURN_STRING(ret,1);
+ } else {
+ RETURN_DOUBLE((double) (sec + msec));
+ }
} else {
RETURN_FALSE;
}
+
}
-#endif
/* }}} */
+#endif
/* {{{ proto array gettimeofday(void)
Returns the current time as array */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard microtime.c
You didn't fix the proto.
And please, try to hold commits for a few hours whilst I roll the beta.
Andi
At 10:03 PM 12/17/2003 +, Andrey Hristov wrote:
andrey Wed Dec 17 17:03:34 2003 EDT
Modified files:
/php-src/ext/standard microtime.c
Log:
Added optional parameter to microtime so now it can return float if it
the user wants. This prevents from getting string representation exploding
it and then creating a float.
Index: php-src/ext/standard/microtime.c
diff -u php-src/ext/standard/microtime.c:1.41
php-src/ext/standard/microtime.c:1.42
--- php-src/ext/standard/microtime.c:1.41 Tue Jun 10 16:03:38 2003
+++ php-src/ext/standard/microtime.cWed Dec 17 17:03:33 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: microtime.c,v 1.41 2003/06/10 20:03:38 imajes Exp $ */
+/* $Id: microtime.c,v 1.42 2003/12/17 22:03:33 andrey Exp $ */
#include php.h
@@ -51,29 +51,40 @@
#define MICRO_IN_SEC 100.00
#define SEC_IN_MIN 60
-/* {{{ proto string microtime(void)
- Returns a string containing the current time in seconds and
microseconds */
#ifdef HAVE_GETTIMEOFDAY
+/* {{{ proto string microtime([bool get_as_float])
+ Returns either a string or a float containing the current time in
seconds and microseconds */
PHP_FUNCTION(microtime)
{
struct timeval tp;
long sec = 0L;
double msec = 0.0;
- char ret[100];
-
+ zend_bool get_as_float = 0;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |b,
get_as_float) == FAILURE) {
+ return;
+ }
+
if (gettimeofday((struct timeval *) tp, (NUL)) == 0) {
msec = (double) (tp.tv_usec / MICRO_IN_SEC);
sec = tp.tv_sec;
if (msec = 1.0) msec -= (long) msec;
- snprintf(ret, 100, %.8f %ld, msec, sec);
- RETVAL_STRING(ret,1);
+ if (get_as_float == 0) {
+ char ret[100];
+
+ snprintf(ret, 100, %.8f %ld, msec, sec);
+ RETURN_STRING(ret,1);
+ } else {
+ RETURN_DOUBLE((double) (sec + msec));
+ }
} else {
RETURN_FALSE;
}
+
}
-#endif
/* }}} */
+#endif
/* {{{ proto array gettimeofday(void)
Returns the current time as array */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
andiWed Dec 17 17:13:58 2003 EDT Modified files: /php-srcNEWS Log: - Update NEWS for tomorrow morning so that I don't forget when I'm sleepy Index: php-src/NEWS diff -u php-src/NEWS:1.1540 php-src/NEWS:1.1541 --- php-src/NEWS:1.1540 Tue Dec 16 17:52:48 2003 +++ php-src/NEWSWed Dec 17 17:13:57 2003 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? Oct 2003, PHP 5 Beta 3 +18 Dec 2003, PHP 5 Beta 3 - Upgraded PCRE library to version 4.5. (Andrei) - Dropped Windows 95 support. (Andi) - Moved extensions to PECL: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes array_access_005.phpt
helly Wed Dec 17 17:14:59 2003 EDT
Added files:
/php-src/tests/classes array_access_005.phpt
Log:
Add new test
Index: php-src/tests/classes/array_access_005.phpt
+++ php-src/tests/classes/array_access_005.phpt
--TEST--
ZE2 ArrayAccess and sub Arrays
--FILE--
?php
class Peoples implements ArrayAccess {
public $person;
function __construct() {
$this-person = array(array('name'='Joe'));
}
function offsetExists($index) {
return array_key_exists($this-person, $index);
}
function offsetGet($index) {
return $this-person[$index];
}
function offsetSet($index, $value) {
$this-person[$index] = $value;
}
function offsetUnset($index) {
unset($this-person[$index]);
}
}
$people = new Peoples;
var_dump($people-person[0]['name']);
$people-person[0]['name'] = $people-person[0]['name'] . 'Foo';
var_dump($people-person[0]['name']);
$people-person[0]['name'] .= 'Bar';
var_dump($people-person[0]['name']);
echo ---ArrayOverloading---\n;
$people = new Peoples;
var_dump($people[0]['name']);
$people[0]['name'] = $people-person[0]['name'] . 'Foo';
var_dump($people[0]['name']);
$people[0]['name'] .= 'Bar';
var_dump($people[0]['name']);
echo ---Done---\n;
?
--EXPECT--
string(3) Joe
string(3) JoeFoo
string(3) JoeFooBar
---ArrayOverloading---
string(3) Joe
string(3) JoeFoo
string(3) JoeFooBar
---Done---
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
andrey Wed Dec 17 17:17:16 2003 EDT Modified files: /php-srcNEWS Log: entry for microtime()'s new clothes Index: php-src/NEWS diff -u php-src/NEWS:1.1541 php-src/NEWS:1.1542 --- php-src/NEWS:1.1541 Wed Dec 17 17:13:57 2003 +++ php-src/NEWSWed Dec 17 17:17:15 2003 @@ -10,6 +10,7 @@ . ext/qtdom (Jani, Derick) - Added 'c' modifier to date() which returns the date in the ISO 8601 format. (Derick, Manuzhai) +- Added optional parameter to microtime() to get the time as float. (Andrey) - Added MacRoman encoding support to htmlentities(). (Derick, Marcus Bointon) - Added possibility to call PHP functions as XSLT-functions. (Christian) - Added possibility to prevent PHP from registering variables when input filter -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard microtime.c
andrey Wed Dec 17 17:21:06 2003 EDT
Modified files:
/php-src/ext/standard microtime.c
Log:
proto fix
Index: php-src/ext/standard/microtime.c
diff -u php-src/ext/standard/microtime.c:1.42 php-src/ext/standard/microtime.c:1.43
--- php-src/ext/standard/microtime.c:1.42 Wed Dec 17 17:03:33 2003
+++ php-src/ext/standard/microtime.cWed Dec 17 17:21:05 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: microtime.c,v 1.42 2003/12/17 22:03:33 andrey Exp $ */
+/* $Id: microtime.c,v 1.43 2003/12/17 22:21:05 andrey Exp $ */
#include php.h
@@ -52,7 +52,7 @@
#define SEC_IN_MIN 60
#ifdef HAVE_GETTIMEOFDAY
-/* {{{ proto string microtime([bool get_as_float])
+/* {{{ proto mixed microtime([bool get_as_float])
Returns either a string or a float containing the current time in seconds and
microseconds */
PHP_FUNCTION(microtime)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gdft.c
rasmus Wed Dec 17 17:47:02 2003 EDT Modified files: /php-src/ext/gd/libgd gdft.c Log: MFB compile fix Index: php-src/ext/gd/libgd/gdft.c diff -u php-src/ext/gd/libgd/gdft.c:1.27 php-src/ext/gd/libgd/gdft.c:1.28 --- php-src/ext/gd/libgd/gdft.c:1.27Tue Dec 16 12:23:15 2003 +++ php-src/ext/gd/libgd/gdft.c Wed Dec 17 17:47:02 2003 @@ -60,7 +60,8 @@ #else #include gdcache.h -#include freetype/freetype.h +#include ft2build.h +#include FT_FREETYPE_H #include freetype/ftglyph.h /* number of fonts cached before least recently used is replaced */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in /main php_version.h
On Wed, 17 Dec 2003, Andi Gutmans wrote: At 11:08 PM 12/17/2003 +0200, Jani Taskinen wrote: Always put the version back to the '-dev' after tagging the source, thank you. (I would guess it's supposed to be RC1-dev :) Jani, relax. We've had this discussion before. Give me enough time to get B3 out before we -dev stuff. I'm keeping it the way it is until I get a thumbs up on the libtool and stuff, and then I'll re-roll as B3 and then we can change it to -dev. I've absolutely no idea what you're talking about. Once tagged, there's no sense keeping the version as it is for a release. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended
johnWed Dec 17 21:06:01 2003 EDT Modified files: /php-srcphp.ini-dist php.ini-recommended Log: Adding the tidy.default_config and tidy.clean_output options to the .ini files Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.202 php-src/php.ini-dist:1.203 --- php-src/php.ini-dist:1.202 Thu Dec 4 07:05:54 2003 +++ php-src/php.ini-distWed Dec 17 21:06:00 2003 @@ -578,6 +578,15 @@ ; Module Settings ; ;;; +[Tidy] +; The path to a default tidy configuration file to use when using tidy +;tidy.default_config = /usr/local/lib/php/default.tcfg + +; Should tidy clean and repair output automatically? +; WARNING: Do not use this option if you are generating non-html content +; such as dynamic images +tidy.clean_output = Off + [Syslog] ; Whether or not to define the various syslog variables (e.g. $LOG_PID, ; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.147 php-src/php.ini-recommended:1.148 --- php-src/php.ini-recommended:1.147 Thu Dec 4 07:05:54 2003 +++ php-src/php.ini-recommended Wed Dec 17 21:06:00 2003 @@ -598,6 +598,15 @@ ; Module Settings ; ;;; +[Tidy] +; The path to a default tidy configuration file to use when using tidy +;tidy.default_config = /usr/local/lib/php/default.tcfg + +; Should tidy clean and repair output automatically? +; WARNING: Do not use this option if you are generating non-html content +; such as dynamic images +tidy.clean_output = Off + [Syslog] ; Whether or not to define the various syslog variables (e.g. $LOG_PID, ; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
