[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon Feb 16 20:32:28 2004 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.407r2=1.408ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.407 ZendEngine2/ChangeLog:1.408 --- ZendEngine2/ChangeLog:1.407 Sat Feb 14 20:33:34 2004 +++ ZendEngine2/ChangeLog Mon Feb 16 20:32:28 2004 @@ -1,3 +1,13 @@ +2004-02-16 Derick Rethans [EMAIL PROTECTED] + +* ZEND_CHANGES: + - Clearify clone behavior, fixed clone example (Patch by Jan Lehnardt) + +2004-02-16 Marcus Boerger [EMAIL PROTECTED] + +* zend_compile.c: + Bugfix #27227 Mixed case class names causes Fatal Error in Constructor call + 2004-02-14 Marcus Boerger [EMAIL PROTECTED] * zend_iterators.c: @@ -3463,7 +3473,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.407 2004/02/15 01:33:34 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.408 2004/02/17 01:32:28 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -5187,7 +5197,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.407 2004/02/15 01:33:34 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.408 2004/02/17 01:32:28 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/soap php_encoding.c php_http.c
dmitry Mon Feb 16 04:56:31 2004 EDT
Modified files:
/php-src/ext/soap php_encoding.c php_http.c
Log:
fix: prevent of possible crash
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.56r2=1.57ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.56 php-src/ext/soap/php_encoding.c:1.57
--- php-src/ext/soap/php_encoding.c:1.56Fri Feb 13 10:19:09 2004
+++ php-src/ext/soap/php_encoding.c Mon Feb 16 04:56:29 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.56 2004/02/13 15:19:09 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.57 2004/02/16 09:56:29 dmitry Exp $ */
#include time.h
@@ -1148,13 +1148,17 @@
xmlNodePtr property;
zval **zprop;
char *str_key;
+ ulong index;
+ int key_type;
- zend_hash_get_current_key(prop, str_key, NULL, FALSE);
+ key_type = zend_hash_get_current_key(prop, str_key,
index, FALSE);
zend_hash_get_current_data(prop, (void **)zprop);
property =
master_to_xml(get_conversion((*zprop)-type), (*zprop), style, xmlParam);
- xmlNodeSetName(property, str_key);
+ if (key_type == HASH_KEY_IS_STRING) {
+ xmlNodeSetName(property, str_key);
+ }
zend_hash_move_forward(prop);
}
}
http://cvs.php.net/diff.php/php-src/ext/soap/php_http.c?r1=1.41r2=1.42ty=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.41 php-src/ext/soap/php_http.c:1.42
--- php-src/ext/soap/php_http.c:1.41Tue Feb 3 11:44:56 2004
+++ php-src/ext/soap/php_http.c Mon Feb 16 04:56:30 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_http.c,v 1.41 2004/02/03 16:44:56 dmitry Exp $ */
+/* $Id: php_http.c,v 1.42 2004/02/16 09:56:30 dmitry Exp $ */
#include php_soap.h
#include ext/standard/base64.h
@@ -224,9 +224,9 @@
}
use_ssl = 0;
- if (strcmp(phpurl-scheme, https) == 0) {
+ if (phpurl-scheme != NULL strcmp(phpurl-scheme, https) == 0) {
use_ssl = 1;
- } else if (strcmp(phpurl-scheme, http) != 0) {
+ } else if (phpurl-scheme == NULL || strcmp(phpurl-scheme, http) != 0) {
xmlFree(buf);
php_url_free(phpurl);
add_soap_fault(this_ptr, HTTP, Unknown protocol. Only http and
https are allowed., NULL, NULL TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard var.c
stasMon Feb 16 06:21:32 2004 EDT
Modified files:
/php-src/ext/standard var.c
Log:
ce is not used, don't get it
http://cvs.php.net/diff.php/php-src/ext/standard/var.c?r1=1.182r2=1.183ty=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.182 php-src/ext/standard/var.c:1.183
--- php-src/ext/standard/var.c:1.182Thu Feb 5 04:07:46 2004
+++ php-src/ext/standard/var.c Mon Feb 16 06:21:31 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: var.c,v 1.182 2004/02/05 09:07:46 stas Exp $ */
+/* $Id: var.c,v 1.183 2004/02/16 11:21:31 stas Exp $ */
/* {{{ includes
@@ -108,8 +108,6 @@
return;
}
- ce = Z_OBJCE(**struc);
-
Z_OBJ_HANDLER(**struc, get_class_name)(*struc, class_name,
class_name_len, 0 TSRMLS_CC);
php_printf(%sobject(%s)#%d (%d) {\n, COMMON, class_name,
Z_OBJ_HANDLE_PP(struc), myht ? zend_hash_num_elements(myht) : 0);
efree(class_name);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap soap.c
dmitry Mon Feb 16 07:04:49 2004 EDT
Modified files:
/php-src/ext/soap soap.c
Log:
Prevent processing SOAP headers with invalid namespace in WSDL mode.
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.84r2=1.85ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.84 php-src/ext/soap/soap.c:1.85
--- php-src/ext/soap/soap.c:1.84Fri Feb 13 10:19:09 2004
+++ php-src/ext/soap/soap.c Mon Feb 16 07:04:48 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.84 2004/02/13 15:19:09 dmitry Exp $ */
+/* $Id: soap.c,v 1.85 2004/02/16 12:04:48 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1366,8 +1366,12 @@
soapHeader *h = header;
header = header-next;
- if (h-mustUnderstand service-sdl !h-function
!h-hdr) {
- soap_server_fault(MustUnderstand,Header not
understood, NULL, NULL TSRMLS_CC);
+ if (service-sdl !h-function !h-hdr) {
+ if (h-mustUnderstand) {
+ soap_server_fault(MustUnderstand,Header not
understood, NULL, NULL TSRMLS_CC);
+ } else {
+ continue;
+ }
}
fn_name =
estrndup(Z_STRVAL(h-function_name),Z_STRLEN(h-function_name));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom attr.c characterdata.c document.c documenttype.c element.c entity.c node.c notation.c processinginstruction.c text.c
rrichards Mon Feb 16 08:07:09 2004 EDT
Modified files:
/php-src/ext/domtext.c processinginstruction.c notation.c node.c
entity.c element.c documenttype.c document.c
characterdata.c attr.c
Log:
issue warning if object is in invalid state when dealing with properties
http://cvs.php.net/diff.php/php-src/ext/dom/text.c?r1=1.16r2=1.17ty=u
Index: php-src/ext/dom/text.c
diff -u php-src/ext/dom/text.c:1.16 php-src/ext/dom/text.c:1.17
--- php-src/ext/dom/text.c:1.16 Sun Feb 15 05:54:37 2004
+++ php-src/ext/dom/text.c Mon Feb 16 08:06:33 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: text.c,v 1.16 2004/02/15 10:54:37 rrichards Exp $ */
+/* $Id: text.c,v 1.17 2004/02/16 13:06:33 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -85,6 +85,11 @@
node = dom_object_get_node(obj);
+ if (node == NULL) {
+ php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC);
+ return FAILURE;
+ }
+
ALLOC_ZVAL(*retval);
wholetext = xmlNodeListGetString(node-doc, node, 1);
ZVAL_STRING(*retval, wholetext, 1);
http://cvs.php.net/diff.php/php-src/ext/dom/processinginstruction.c?r1=1.10r2=1.11ty=u
Index: php-src/ext/dom/processinginstruction.c
diff -u php-src/ext/dom/processinginstruction.c:1.10
php-src/ext/dom/processinginstruction.c:1.11
--- php-src/ext/dom/processinginstruction.c:1.10Sun Feb 15 12:07:34 2004
+++ php-src/ext/dom/processinginstruction.c Mon Feb 16 08:06:33 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: processinginstruction.c,v 1.10 2004/02/15 17:07:34 rrichards Exp $ */
+/* $Id: processinginstruction.c,v 1.11 2004/02/16 13:06:33 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -86,6 +86,11 @@
nodep = dom_object_get_node(obj);
+ if (nodep == NULL) {
+ php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC);
+ return FAILURE;
+ }
+
ALLOC_ZVAL(*retval);
ZVAL_STRING(*retval, (char *) (nodep-name), 1);
@@ -108,6 +113,11 @@
nodep = dom_object_get_node(obj);
+ if (nodep == NULL) {
+ php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC);
+ return FAILURE;
+ }
+
ALLOC_ZVAL(*retval);
@@ -128,6 +138,11 @@
nodep = dom_object_get_node(obj);
+ if (nodep == NULL) {
+ php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC);
+ return FAILURE;
+ }
+
if (newval-type != IS_STRING) {
if(newval-refcount 1) {
value_copy = *newval;
http://cvs.php.net/diff.php/php-src/ext/dom/notation.c?r1=1.5r2=1.6ty=u
Index: php-src/ext/dom/notation.c
diff -u php-src/ext/dom/notation.c:1.5 php-src/ext/dom/notation.c:1.6
--- php-src/ext/dom/notation.c:1.5 Thu Jan 8 03:15:17 2004
+++ php-src/ext/dom/notation.c Mon Feb 16 08:06:33 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: notation.c,v 1.5 2004/01/08 08:15:17 andi Exp $ */
+/* $Id: notation.c,v 1.6 2004/02/16 13:06:33 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -51,6 +51,12 @@
xmlNotationPtr nodep;
nodep = (xmlNotationPtr) dom_object_get_node(obj);
+
+ if (nodep == NULL) {
+ php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC);
+ return FAILURE;
+ }
+
ALLOC_ZVAL(*retval);
if (nodep-PublicID) {
ZVAL_STRING(*retval, (char *) (nodep-PublicID), 1);
@@ -75,6 +81,12 @@
xmlNotationPtr nodep;
nodep = (xmlNotationPtr) dom_object_get_node(obj);
+
+ if (nodep == NULL) {
+ php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC);
+ return FAILURE;
+ }
+
ALLOC_ZVAL(*retval);
if (nodep-SystemID) {
ZVAL_STRING(*retval, (char *) (nodep-PublicID), 1);
http://cvs.php.net/diff.php/php-src/ext/dom/node.c?r1=1.23r2=1.24ty=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.23 php-src/ext/dom/node.c:1.24
--- php-src/ext/dom/node.c:1.23 Sun Feb 15 09:05:17 2004
+++ php-src/ext/dom/node.c Mon Feb 16 08:06:33 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: node.c,v 1.23 2004/02/15 14:05:17 rrichards Exp $ */
+/* $Id: node.c,v 1.24 2004/02/16 13:06:33 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -86,6 +86,11 @@
nodep = dom_object_get_node(obj);
+ if (nodep == NULL) {
+ php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC);
+ return FAILURE;
+ }
+
switch (nodep-type) {
case XML_ATTRIBUTE_NODE:
case
[PHP-CVS] cvs: php-src(PHP_4_3) /main php_ini.c
derick Mon Feb 16 09:29:08 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main php_ini.c
Log:
- MFH: Fixed zero bytes memory allocation when no extra ini files are found in
the --with-config-file-scan-dir specified directory. (Eric Colinet, Derick)
http://cvs.php.net/diff.php/php-src/main/php_ini.c?r1=1.106.2.12r2=1.106.2.13ty=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.106.2.12 php-src/main/php_ini.c:1.106.2.13
--- php-src/main/php_ini.c:1.106.2.12 Fri May 30 21:37:44 2003
+++ php-src/main/php_ini.c Mon Feb 16 09:29:07 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.106.2.12 2003/05/31 01:37:44 sniper Exp $ */
+/* $Id: php_ini.c,v 1.106.2.13 2004/02/16 14:29:07 derick Exp $ */
/* Check CWD for php.ini */
#define INI_CHECK_CWD
@@ -441,12 +441,14 @@
* Don't need an extra byte for the \0 in this malloc as the
last
* element will not get a trailing , which gives us the byte
for the \0
*/
- php_ini_scanned_files = (char *) malloc(total_l);
- *php_ini_scanned_files = '\0';
- for (element = scanned_ini_list.head; element; element =
element-next) {
- strcat(php_ini_scanned_files, *(char
**)element-data);
- strcat(php_ini_scanned_files, element-next ? ,\n :
\n);
- }
+ if (total_l) {
+ php_ini_scanned_files = (char *) malloc(total_l);
+ *php_ini_scanned_files = '\0';
+ for (element = scanned_ini_list.head; element; element
= element-next) {
+ strcat(php_ini_scanned_files, *(char
**)element-data);
+ strcat(php_ini_scanned_files, element-next ?
,\n : \n);
+ }
+ }
zend_llist_destroy(scanned_ini_list);
}
}
--
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
derick Mon Feb 16 09:29:32 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: - Update news too http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.564r2=1.1247.2.565ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.564 php-src/NEWS:1.1247.2.565 --- php-src/NEWS:1.1247.2.564 Fri Feb 13 05:51:02 2004 +++ php-src/NEWSMon Feb 16 09:29:31 2004 @@ -1,6 +1,8 @@ PHP 4 NEWS ||| ?? Feb 2004, Version 4.3.5 +- Fixed zero bytes memory allocation when no extra ini files are found in the + --with-config-file-scan-dir specified directory. (Eric Colinet, Derick) - Fixed bug #27235 (Interbase NUMERIC x.0 field returns empty string on 0). (Ard) - Fixed bug #27196 (Missing content_length initialization in apache 2 sapis). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql/tests skipif.inc
jan Mon Feb 16 09:41:39 2004 EDT
Modified files:
/php-src/ext/mysql/testsskipif.inc
Log:
- fix typo
http://cvs.php.net/diff.php/php-src/ext/mysql/tests/skipif.inc?r1=1.1r2=1.2ty=u
Index: php-src/ext/mysql/tests/skipif.inc
diff -u php-src/ext/mysql/tests/skipif.inc:1.1 php-src/ext/mysql/tests/skipif.inc:1.2
--- php-src/ext/mysql/tests/skipif.inc:1.1 Sun Jan 11 21:31:08 2004
+++ php-src/ext/mysql/tests/skipif.inc Mon Feb 16 09:41:38 2004
@@ -2,7 +2,7 @@
include 'connect.inc';
$link = @mysql_connect($host, $user, $passwd);
-if (!$link) die('skip canot connect');
+if (!$link) die('skip cannot connect');
mysql_close($link);
?
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gmp gmp.c
iliaa Mon Feb 16 10:13:42 2004 EDT
Modified files:
/php-src/ext/gmpgmp.c
Log:
Better gmp fix.
http://cvs.php.net/diff.php/php-src/ext/gmp/gmp.c?r1=1.44r2=1.45ty=u
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.44 php-src/ext/gmp/gmp.c:1.45
--- php-src/ext/gmp/gmp.c:1.44 Sun Feb 15 12:22:57 2004
+++ php-src/ext/gmp/gmp.c Mon Feb 16 10:13:40 2004
@@ -312,7 +312,6 @@
FETCH_GMP_ZVAL(gmpnum_b, b_arg);
}
- convert_to_long_ex(b_arg);
if (!Z_LVAL_PP(b_arg)) {
RETURN_FALSE;
}
@@ -358,7 +357,6 @@
FETCH_GMP_ZVAL(gmpnum_b, b_arg);
}
- convert_to_long_ex(b_arg);
if (!Z_LVAL_PP(b_arg)) {
RETURN_FALSE;
}
--
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/gmp gmp.c
iliaa Mon Feb 16 10:13:49 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/gmpgmp.c
Log:
MFH: Better gmp fix.
http://cvs.php.net/diff.php/php-src/ext/gmp/gmp.c?r1=1.29.4.9r2=1.29.4.10ty=u
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.29.4.9 php-src/ext/gmp/gmp.c:1.29.4.10
--- php-src/ext/gmp/gmp.c:1.29.4.9 Sun Feb 15 12:23:11 2004
+++ php-src/ext/gmp/gmp.c Mon Feb 16 10:13:49 2004
@@ -309,7 +309,6 @@
FETCH_GMP_ZVAL(gmpnum_b, b_arg);
}
- convert_to_long_ex(b_arg);
if (!Z_LVAL_PP(b_arg)) {
RETURN_FALSE;
}
@@ -353,7 +352,6 @@
FETCH_GMP_ZVAL(gmpnum_b, b_arg);
}
- convert_to_long_ex(b_arg);
if (!Z_LVAL_PP(b_arg)) {
RETURN_FALSE;
}
--
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
iliaa Mon Feb 16 10:15:23 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
Log:
Bug fixing news.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.565r2=1.1247.2.566ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.565 php-src/NEWS:1.1247.2.566
--- php-src/NEWS:1.1247.2.565 Mon Feb 16 09:29:31 2004
+++ php-src/NEWSMon Feb 16 10:15:22 2004
@@ -1,6 +1,6 @@
PHP 4 NEWS
|||
-?? Feb 2004, Version 4.3.5
+16 Feb 2004, Version 4.3.5RC3
- Fixed zero bytes memory allocation when no extra ini files are found in the
--with-config-file-scan-dir specified directory. (Eric Colinet, Derick)
- Fixed bug #27235 (Interbase NUMERIC x.0 field returns empty string on 0).
@@ -13,6 +13,7 @@
(Ilia, sagawa at sohgoh dot net)
- Fixed bug #27172 (Possible floating point exception in gmp_powm()). (Ilia)
- Fixed bug #27171 (crash inside gmp_hamdist()). (Jani)
+- Fixed bug #27157 (Compile Failure on Solaris 8). (Timm)
- Fixed bug #27149 (broken CLOB support in oci8 extension). (Antony)
- Fixed bug #27135 (Possible crash inside mb_strlen()). (Moriyoshi)
- Fixed bug #27104 (CLI/CGI SAPI module variable name conflict). (Marcus)
@@ -24,6 +25,7 @@
tcarter at noggin dot com dot au)
- Fixed bug #26653 (open_basedir incorrectly resolved on win32). (Ilia,
scottmacvicar at ntlworld dot com)
+- Fixed bug #26407 (Result set fetching broken around transactions). (Timm)
- Fixed bug #24773 (unsetting string as array causes a crash). (Sara)
- Fixed bug #23467 (date('T') outputs incorrect Time Zone).
(Jani, scottmacvicar at ntlworld dot com)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli/tests 017.phpt 026.phpt 035.phpt 045.phpt
georg Mon Feb 16 10:32:48 2004 EDT
Modified files:
/php-src/ext/mysqli/tests 017.phpt 026.phpt 035.phpt 045.phpt
Log:
fixed some tests
added skip section for prepared statements when using SHOW command
http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/017.phpt?r1=1.3r2=1.4ty=u
Index: php-src/ext/mysqli/tests/017.phpt
diff -u php-src/ext/mysqli/tests/017.phpt:1.3 php-src/ext/mysqli/tests/017.phpt:1.4
--- php-src/ext/mysqli/tests/017.phpt:1.3 Wed Feb 11 02:39:28 2004
+++ php-src/ext/mysqli/tests/017.phpt Mon Feb 16 10:32:46 2004
@@ -22,9 +22,11 @@
mysqli_close($link);
?
--EXPECT--
-array(2) {
+array(3) {
[0]=
string(14) [EMAIL PROTECTED]
[1]=
string(4) test
+ [2]=
+ string(3) foo
}
http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/026.phpt?r1=1.3r2=1.4ty=u
Index: php-src/ext/mysqli/tests/026.phpt
diff -u php-src/ext/mysqli/tests/026.phpt:1.3 php-src/ext/mysqli/tests/026.phpt:1.4
--- php-src/ext/mysqli/tests/026.phpt:1.3 Wed Feb 11 02:39:28 2004
+++ php-src/ext/mysqli/tests/026.phpt Mon Feb 16 10:32:46 2004
@@ -19,9 +19,9 @@
$c1 = Hello World;
- mysqli_send_long_data($stmt, 2, This is the first sentence.);
- mysqli_send_long_data($stmt, 2, And this is the second sentence.);
- mysqli_send_long_data($stmt, 2, And finally this is the last sentence.);
+ mysqli_send_long_data($stmt, 1, This is the first sentence.);
+ mysqli_send_long_data($stmt, 1, And this is the second sentence.);
+ mysqli_send_long_data($stmt, 1, And finally this is the last sentence.);
mysqli_execute($stmt);
mysqli_stmt_close($stmt);
http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/035.phpt?r1=1.1r2=1.2ty=u
Index: php-src/ext/mysqli/tests/035.phpt
diff -u php-src/ext/mysqli/tests/035.phpt:1.1 php-src/ext/mysqli/tests/035.phpt:1.2
--- php-src/ext/mysqli/tests/035.phpt:1.1 Tue Feb 11 19:46:29 2003
+++ php-src/ext/mysqli/tests/035.phpt Mon Feb 16 10:32:46 2004
@@ -11,9 +11,9 @@
$sinfo = substr(mysqli_get_server_info($link),0,1);
- var_dump($sinfo);
+ var_dump(strlen($sinfo));
mysqli_close($link);
?
--EXPECT--
-string(1) 4
+int(1)
http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/045.phpt?r1=1.2r2=1.3ty=u
Index: php-src/ext/mysqli/tests/045.phpt
diff -u php-src/ext/mysqli/tests/045.phpt:1.2 php-src/ext/mysqli/tests/045.phpt:1.3
--- php-src/ext/mysqli/tests/045.phpt:1.2 Sat Jun 28 17:30:58 2003
+++ php-src/ext/mysqli/tests/045.phpt Mon Feb 16 10:32:46 2004
@@ -1,5 +1,20 @@
--TEST--
mysqli_bind_result (SHOW)
+--SKIPIF--
+?php
+ include connect.inc;
+ $link = mysqli_connect(localhost, $user, $passwd);
+
+
+ $stmt = mysqli_prepare($link, SHOW VARIABLES LIKE 'port');
+ mysqli_execute($stmt);
+
+ if (!$stmt-field_count) {
+ printf(skip SHOW command is not supported in prepared statements.);
+ }
+ $stmt-close();
+ mysqli_close($link);
+?
--FILE--
?php
include connect.inc;
@@ -8,8 +23,8 @@
$link = mysqli_connect(localhost, $user, $passwd);
$stmt = mysqli_prepare($link, SHOW VARIABLES LIKE 'port');
-
mysqli_execute($stmt);
+
mysqli_bind_result($stmt, $c1, $c2);
mysqli_fetch($stmt);
mysqli_stmt_close($stmt);
--
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) / configure.in /main php_version.h
iliaa Mon Feb 16 10:34:17 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcconfigure.in /php-src/main php_version.h Log: Go with RC3 http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.95r2=1.396.2.96ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.95 php-src/configure.in:1.396.2.96 --- php-src/configure.in:1.396.2.95 Wed Feb 11 11:49:24 2004 +++ php-src/configure.inMon Feb 16 10:34:16 2004 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.95 2004/02/11 16:49:24 iliaa Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.96 2004/02/16 15:34:16 iliaa Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=4 MINOR_VERSION=3 RELEASE_VERSION=5 -EXTRA_VERSION=RC3-dev +EXTRA_VERSION=RC3 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.66.2.42r2=1.66.2.43ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.42 php-src/main/php_version.h:1.66.2.43 --- php-src/main/php_version.h:1.66.2.42Wed Feb 11 11:49:23 2004 +++ php-src/main/php_version.h Mon Feb 16 10:34:16 2004 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION RC3-dev -#define PHP_VERSION 4.3.5RC3-dev +#define PHP_EXTRA_VERSION RC3 +#define PHP_VERSION 4.3.5RC3 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sniper Mon Feb 16 11:00:16 2004 EDT Modified files: /php-srcNEWS Log: this was MFHd.. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1611r2=1.1612ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1611 php-src/NEWS:1.1612 --- php-src/NEWS:1.1611 Sun Feb 15 19:34:35 2004 +++ php-src/NEWSMon Feb 16 11:00:15 2004 @@ -2,8 +2,6 @@ ||| ?? ??? 2004, PHP 5 Release Candidate 1 - Fixed problem preventing startup errors from being displayed. (Marcus) -- Fixed zero bytes memory allocation when no extra ini files are found in the - --with-config-file-scan-dir specified directory. (Eric Colinet, Derick) - Fixed start-up problem if both SPL and SimpleXML were enabled. The double initialization of apache 1.3 was causing problems here. (Marcus, Derick) - Fixed bug #27237 (Working with simplexml crashes apache2). (Rob) -- 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) / configure.in /main php_version.h
iliaa Mon Feb 16 11:03:35 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcconfigure.in /php-src/main php_version.h Log: Back to dev. http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.96r2=1.396.2.97ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.96 php-src/configure.in:1.396.2.97 --- php-src/configure.in:1.396.2.96 Mon Feb 16 10:34:16 2004 +++ php-src/configure.inMon Feb 16 11:03:34 2004 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.96 2004/02/16 15:34:16 iliaa Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.97 2004/02/16 16:03:34 iliaa Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=4 MINOR_VERSION=3 RELEASE_VERSION=5 -EXTRA_VERSION=RC3 +EXTRA_VERSION=RC4-dev VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.66.2.43r2=1.66.2.44ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.43 php-src/main/php_version.h:1.66.2.44 --- php-src/main/php_version.h:1.66.2.43Mon Feb 16 10:34:16 2004 +++ php-src/main/php_version.h Mon Feb 16 11:03:35 2004 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION RC3 -#define PHP_VERSION 4.3.5RC3 +#define PHP_EXTRA_VERSION RC4-dev +#define PHP_VERSION 4.3.5RC4-dev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mnogosearch php_mnogo.c
gluke Mon Feb 16 11:11:56 2004 EDT
Modified files:
/php-src/ext/mnogosearchphp_mnogo.c
Log:
- A fix to make UDM_LIMIT_DATE work was applied. Thanx to
d.rousseau at nnx.com
http://cvs.php.net/diff.php/php-src/ext/mnogosearch/php_mnogo.c?r1=1.86r2=1.87ty=u
Index: php-src/ext/mnogosearch/php_mnogo.c
diff -u php-src/ext/mnogosearch/php_mnogo.c:1.86
php-src/ext/mnogosearch/php_mnogo.c:1.87
--- php-src/ext/mnogosearch/php_mnogo.c:1.86Thu Jan 8 03:16:08 2004
+++ php-src/ext/mnogosearch/php_mnogo.c Mon Feb 16 11:11:55 2004
@@ -1,5 +1,5 @@
/* $Source: /repository/php-src/ext/mnogosearch/php_mnogo.c,v $ */
-/* $Id: php_mnogo.c,v 1.86 2004/01/08 08:16:08 andi Exp $ */
+/* $Id: php_mnogo.c,v 1.87 2004/02/16 16:11:55 gluke Exp $ */
/*
+--+
@@ -1394,6 +1394,48 @@
stl_info.t1=(time_t)(atol(val+1));
UdmAddTimeLimit(Agent-Conf,stl_info);
}
+#elif UDM_VERSION_ID = 30210
+{
+ struct tm *d_tm;
+time_t d_t;
+char*d_val2;
+chard_db[20], d_de[20];
+d_t = atol (val+1);
+d_tm = localtime (d_t);
+if (val[0] == '') {
+ UdmVarListReplaceStr(Agent-Conf-Vars,dt,er);
+UdmVarListReplaceStr(Agent-Conf-Vars,dx,1);
+sprintf (d_db, %d, d_tm-tm_mday);
+UdmVarListReplaceStr(Agent-Conf-Vars,dd,d_db);
+sprintf (d_db, %d, d_tm-tm_mon);
+UdmVarListReplaceStr(Agent-Conf-Vars,dm,d_db);
+sprintf (d_db, %d, d_tm-tm_year+1900);
+UdmVarListReplaceStr(Agent-Conf-Vars,dy,d_db);
+RETURN_TRUE;
+} else if (val[0] == '') {
+UdmVarListReplaceStr(Agent-Conf-Vars,dt,er);
+UdmVarListReplaceStr(Agent-Conf-Vars,dx,-1);
+sprintf (d_db, %d, d_tm-tm_mday);
+UdmVarListReplaceStr(Agent-Conf-Vars,dd,d_db);
+sprintf (d_db, %d, d_tm-tm_mon);
+UdmVarListReplaceStr(Agent-Conf-Vars,dm,d_db);
+sprintf (d_db, %d, d_tm-tm_year+1900);
+UdmVarListReplaceStr(Agent-Conf-Vars,dy,d_db);
+RETURN_TRUE;
+} else if ( (val[0]=='#') (d_val2 = strchr(val,',')) ){
+UdmVarListReplaceStr(Agent-Conf-Vars,dt,range);
+sprintf (d_db, %d/%d/%d, d_tm-tm_mday,
d_tm-tm_mon+1, d_tm-tm_year+1900);
+d_t = atol (d_val2+1);
+d_tm = localtime (d_t);
+sprintf (d_de, %d/%d/%d, d_tm-tm_mday,
d_tm-tm_mon+1, d_tm-tm_year+1900);
+UdmVarListReplaceStr(Agent-Conf-Vars,db,d_db);
+UdmVarListReplaceStr(Agent-Conf-Vars,de,d_de);
+RETURN_TRUE;
+} else {
+php_error_docref(NULL TSRMLS_CC, E_WARNING,Incorrect
date limit format);
+RETURN_FALSE;
+}
+ }
#endif
break;
default:
@@ -2200,9 +2242,9 @@
{
int len,i;
for(len = i = 0; i Res-WWList.nwords; i++)
- len += Res-WWList.Word[i].len;
+ len += Res-WWList.Word[i].len + 64;
{
- size_t wsize=(1+len*15)*sizeof(char);
+ size_t wsize=(1+len)*sizeof(char);
char *wordinfo = (char*) malloc(wsize);
*wordinfo = '\0';
@@ -2230,9 +2272,9 @@
{
int len,i,j;
for(len = i = 0; i Res-WWList.nwords; i++)
- len += Res-WWList.Word[i].len;
+ len += Res-WWList.Word[i].len + 64;
{
- size_t wsize=(1+len*15)*sizeof(char);
+ size_t wsize=(1+len)*sizeof(char);
char *wordinfo = (char*) malloc(wsize);
int
[PHP-CVS] cvs: php-src /ext/soap php_sdl.c
dmitry Mon Feb 16 11:32:53 2004 EDT Modified files: /php-src/ext/soap php_sdl.c Log: BUGFIX: incorrect restoring of negative integers from WSDL cache http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.59r2=1.60ty=u Index: php-src/ext/soap/php_sdl.c diff -u php-src/ext/soap/php_sdl.c:1.59 php-src/ext/soap/php_sdl.c:1.60 --- php-src/ext/soap/php_sdl.c:1.59 Fri Feb 13 10:19:09 2004 +++ php-src/ext/soap/php_sdl.c Mon Feb 16 11:32:52 2004 @@ -17,7 +17,7 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: php_sdl.c,v 1.59 2004/02/13 15:19:09 dmitry Exp $ */ +/* $Id: php_sdl.c,v 1.60 2004/02/16 16:32:52 dmitry Exp $ */ #include php_soap.h #include libxml/uri.h @@ -877,7 +877,7 @@ #define WSDL_CACHE_VERSION 01 #define WSDL_CACHE_GET(ret,type,buf) memcpy(ret,*buf,sizeof(type)); *buf += sizeof(type); -#define WSDL_CACHE_GET_INT(ret,buf)ret = ((int)(*buf)[0])+((int)(*buf)[1]8)+((int)(*buf)[2]16)+((int)(*buf)[3]24); *buf += 4; +#define WSDL_CACHE_GET_INT(ret,buf)ret = ((int)(*buf)[0])|((int)(*buf)[1]8)|((int)(*buf)[2]16)|((int)(*buf)[3]24); *buf += 4; #define WSDL_CACHE_GET_1(ret,type,buf) ret = (type)(**buf); (*buf)++; #define WSDL_CACHE_GET_N(ret,n,buf)memcpy(ret,*buf,n); *buf += n; #define WSDL_CACHE_SKIP(n,buf) *buf += n; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_encoding.c
dmitry Mon Feb 16 11:36:00 2004 EDT
Modified files:
/php-src/ext/soap php_encoding.c
Log:
specal case of array encoding. If object has only one inner element and this element
has max_occurs 1, then array can be passed directly.
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.57r2=1.58ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.57 php-src/ext/soap/php_encoding.c:1.58
--- php-src/ext/soap/php_encoding.c:1.57Mon Feb 16 04:56:29 2004
+++ php-src/ext/soap/php_encoding.c Mon Feb 16 11:35:59 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.57 2004/02/16 09:56:29 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.58 2004/02/16 16:35:59 dmitry Exp $ */
#include time.h
@@ -1032,6 +1032,37 @@
return 1;
}
+static sdlTypePtr model_array_element(sdlContentModelPtr model)
+{
+ switch (model-kind) {
+ case XSD_CONTENT_ELEMENT: {
+ if (model-max_occurs == -1 || model-max_occurs 1) {
+ return model-u.element;
+ } else {
+ return NULL;
+ }
+ }
+ case XSD_CONTENT_SEQUENCE:
+ case XSD_CONTENT_ALL:
+ case XSD_CONTENT_CHOICE: {
+ sdlContentModelPtr *tmp;
+
+ if (zend_hash_num_elements(model-u.content) != 1) {
+ return NULL;
+ }
+ zend_hash_internal_pointer_reset(model-u.content);
+ zend_hash_get_current_data(model-u.content, (void**)tmp);
+ return model_array_element(*tmp);
+ }
+ case XSD_CONTENT_GROUP: {
+ return model_array_element(model-u.group-model);
+ }
+ default:
+ break;
+ }
+ return NULL;
+}
+
static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNodePtr
parent)
{
xmlNodePtr xmlParam;
@@ -1098,7 +1129,22 @@
FIND_ZVAL_NULL(data, xmlParam, style);
if (prop != NULL) {
- if (sdlType-model) {
+ sdlTypePtr array_el;
+
+ if (Z_TYPE_P(data) == IS_ARRAY
+ !is_map(data)
+ sdlType-attributes == NULL
+ sdlType-model != NULL
+ (array_el = model_array_element(sdlType-model)) != NULL) {
+ zval **val;
+
+ zend_hash_internal_pointer_reset(prop);
+ while (zend_hash_get_current_data(prop,(void**)val)
== SUCCESS) {
+ xmlNodePtr property =
master_to_xml(array_el-encode, *val, style, xmlParam);
+ xmlNodeSetName(property, array_el-name);
+ zend_hash_move_forward(prop);
+ }
+ } else if (sdlType-model) {
model_to_xml_object(xmlParam, sdlType-model, prop,
style, 1);
}
if (sdlType-attributes) {
--
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/strings bug27278.phpt
sniper Mon Feb 16 11:51:25 2004 EDT
Added files: (Branch: PHP_4_3)
/php-src/ext/standard/tests/strings bug27278.phpt
Log:
MFH
http://cvs.php.net/co.php/php-src/ext/standard/tests/strings/bug27278.phpt?r=1.1p=1
Index: php-src/ext/standard/tests/strings/bug27278.phpt
+++ php-src/ext/standard/tests/strings/bug27278.phpt
--TEST--
Bug #23894 (sprintf() decimal specifiers problem)
Bug #27278 (sprintf(): global variable changing type when passed to function by value)
--FILE--
?php
function foo ($a)
{
$a=sprintf(%02d,$a);
var_dump($a);
}
$x=02;
var_dump($x);
foo($x);
var_dump($x);
?
--EXPECT--
string(2) 02
string(2) 02
string(2) 02
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tokenizer/tests bug26463.phpt
iliaa Mon Feb 16 12:09:09 2004 EDT
Modified files:
/php-src/ext/tokenizer/testsbug26463.phpt
Log:
Fix test.
http://cvs.php.net/diff.php/php-src/ext/tokenizer/tests/bug26463.phpt?r1=1.1r2=1.2ty=u
Index: php-src/ext/tokenizer/tests/bug26463.phpt
diff -u php-src/ext/tokenizer/tests/bug26463.phpt:1.1
php-src/ext/tokenizer/tests/bug26463.phpt:1.2
--- php-src/ext/tokenizer/tests/bug26463.phpt:1.1 Sat Nov 29 14:05:13 2003
+++ php-src/ext/tokenizer/tests/bug26463.phpt Mon Feb 16 12:09:08 2004
@@ -13,12 +13,12 @@
?';
var_dump(token_get_all($str));
?
---EXPECT--
+--EXPECTF--
array(17) {
[0]=
array(2) {
[0]=
-int(363)
+int(%d)
[1]=
string(6) ?php
@@ -26,7 +26,7 @@
[1]=
array(2) {
[0]=
-int(307)
+int(%d)
[1]=
string(2) $x
}
@@ -35,7 +35,7 @@
[3]=
array(2) {
[0]=
-int(367)
+int(%d)
[1]=
string(6) DD
@@ -43,7 +43,7 @@
[4]=
array(2) {
[0]=
-int(305)
+int(%d)
[1]=
string(13) jhdsjkfhjdsh
@@ -51,7 +51,7 @@
[5]=
array(2) {
[0]=
-int(368)
+int(%d)
[1]=
string(2) DD
}
@@ -60,7 +60,7 @@
[7]=
array(2) {
[0]=
-int(313)
+int(%d)
[1]=
string(2)
}
@@ -69,7 +69,7 @@
[9]=
array(2) {
[0]=
-int(366)
+int(%d)
[1]=
string(1)
@@ -77,7 +77,7 @@
[10]=
array(2) {
[0]=
-int(307)
+int(%d)
[1]=
string(2) $a
}
@@ -86,7 +86,7 @@
[12]=
array(2) {
[0]=
-int(367)
+int(%d)
[1]=
string(8)
@@ -94,7 +94,7 @@
[13]=
array(2) {
[0]=
-int(305)
+int(%d)
[1]=
string(13) jhdsjkfhjdsh
@@ -102,7 +102,7 @@
[14]=
array(2) {
[0]=
-int(368)
+int(%d)
[1]=
string(4)
}
@@ -111,7 +111,7 @@
[16]=
array(2) {
[0]=
-int(365)
+int(%d)
[1]=
string(2) ?
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard formatted_print.c
iliaa Mon Feb 16 12:09:38 2004 EDT
Modified files:
/php-src/ext/standard formatted_print.c
Log:
Fixed bug #27278 (*printf() functions treat arguments as if passed by
reference).
http://cvs.php.net/diff.php/php-src/ext/standard/formatted_print.c?r1=1.73r2=1.74ty=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.73
php-src/ext/standard/formatted_print.c:1.74
--- php-src/ext/standard/formatted_print.c:1.73 Tue Jan 20 23:00:07 2004
+++ php-src/ext/standard/formatted_print.c Mon Feb 16 12:09:37 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: formatted_print.c,v 1.73 2004/01/21 04:00:07 sniper Exp $ */
+/* $Id: formatted_print.c,v 1.74 2004/02/16 17:09:37 iliaa Exp $ */
#include math.h /* modf() */
#include php.h
@@ -626,6 +626,7 @@
*tmp = **(args[argnum]);
zval_copy_ctor(tmp);
} else {
+ SEPARATE_ZVAL(args[argnum]);
tmp = *(args[argnum]);
}
--
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/standard formatted_print.c
iliaa Mon Feb 16 12:09:53 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard formatted_print.c
Log:
MFH: Fixed bug #27278 (*printf() functions treat arguments as if passed by
reference).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.566r2=1.1247.2.567ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.566 php-src/NEWS:1.1247.2.567
--- php-src/NEWS:1.1247.2.566 Mon Feb 16 10:15:22 2004
+++ php-src/NEWSMon Feb 16 12:09:51 2004
@@ -1,5 +1,9 @@
PHP 4 NEWS
|||
+?? Feb 2004, Version 4.3.5
+- Fixed bug #27278 (*printf() functions treat arguments as if passed by
+ reference). (ilia)
+
16 Feb 2004, Version 4.3.5RC3
- Fixed zero bytes memory allocation when no extra ini files are found in the
--with-config-file-scan-dir specified directory. (Eric Colinet, Derick)
http://cvs.php.net/diff.php/php-src/ext/standard/formatted_print.c?r1=1.59.2.7r2=1.59.2.8ty=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.59.2.7
php-src/ext/standard/formatted_print.c:1.59.2.8
--- php-src/ext/standard/formatted_print.c:1.59.2.7 Tue Jan 20 23:00:47 2004
+++ php-src/ext/standard/formatted_print.c Mon Feb 16 12:09:52 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: formatted_print.c,v 1.59.2.7 2004/01/21 04:00:47 sniper Exp $ */
+/* $Id: formatted_print.c,v 1.59.2.8 2004/02/16 17:09:52 iliaa Exp $ */
#include math.h /* modf() */
#include php.h
@@ -613,6 +613,7 @@
*tmp = **(args[argnum]);
zval_copy_ctor(tmp);
} else {
+ SEPARATE_ZVAL(args[argnum]);
tmp = *(args[argnum]);
}
--
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 Mon Feb 16 12:42:24 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: typofix :) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.567r2=1.1247.2.568ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.567 php-src/NEWS:1.1247.2.568 --- php-src/NEWS:1.1247.2.567 Mon Feb 16 12:09:51 2004 +++ php-src/NEWSMon Feb 16 12:42:22 2004 @@ -2,7 +2,7 @@ ||| ?? Feb 2004, Version 4.3.5 - Fixed bug #27278 (*printf() functions treat arguments as if passed by - reference). (ilia) + reference). (Ilia) 16 Feb 2004, Version 4.3.5RC3 - Fixed zero bytes memory allocation when no extra ini files are found in the -- 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/strings bug27278.phpt
sniper Mon Feb 16 12:44:28 2004 EDT Modified files: /php-src/ext/standard/tests/strings bug27278.phpt Log: shorten the description a bit http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/bug27278.phpt?r1=1.2r2=1.3ty=u Index: php-src/ext/standard/tests/strings/bug27278.phpt diff -u php-src/ext/standard/tests/strings/bug27278.phpt:1.2 php-src/ext/standard/tests/strings/bug27278.phpt:1.3 --- php-src/ext/standard/tests/strings/bug27278.phpt:1.2Mon Feb 16 11:50:53 2004 +++ php-src/ext/standard/tests/strings/bug27278.phptMon Feb 16 12:44:27 2004 @@ -1,5 +1,5 @@ --TEST-- -Bug #27278 (sprintf(): global variable changing type when passed to function by value) +Bug #27278 (*printf() functions treat arguments as if passed by reference) --FILE-- ?php -- 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/strings bug27278.phpt
sniper Mon Feb 16 12:44:55 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/standard/tests/strings bug27278.phpt Log: MFH http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/bug27278.phpt?r1=1.2.2.1r2=1.2.2.2ty=u Index: php-src/ext/standard/tests/strings/bug27278.phpt diff -u php-src/ext/standard/tests/strings/bug27278.phpt:1.2.2.1 php-src/ext/standard/tests/strings/bug27278.phpt:1.2.2.2 --- php-src/ext/standard/tests/strings/bug27278.phpt:1.2.2.1Mon Feb 16 11:51:23 2004 +++ php-src/ext/standard/tests/strings/bug27278.phptMon Feb 16 12:44:55 2004 @@ -1,5 +1,5 @@ --TEST-- -Bug #27278 (sprintf(): global variable changing type when passed to function by value) +Bug #27278 (*printf() functions treat arguments as if passed by reference) --FILE-- ?php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / .gdbinit
moriyoshi Mon Feb 16 15:20:56 2004 EDT Modified files: /php-src.gdbinit Log: - Add zbacktrace user-defined command. http://cvs.php.net/diff.php/php-src/.gdbinit?r1=1.9r2=1.10ty=u Index: php-src/.gdbinit diff -u php-src/.gdbinit:1.9 php-src/.gdbinit:1.10 --- php-src/.gdbinit:1.9Mon May 5 07:43:50 2003 +++ php-src/.gdbinitMon Feb 16 15:20:55 2004 @@ -273,6 +273,18 @@ dump operands of the current opline end +define zbacktrace + executor_globals + dump_bt $eg.current_execute_data +end + +document zbacktrace + prints backtrace. + This command is almost a short cut for +(gdb) executor_globals +(gdb) dump_bt $eg.current_execute_data +end + define zmemcheck set $p = alloc_globals.head set $stat = ? @@ -345,4 +357,3 @@ usage: zmemcheck [ptr]. if ptr is 0, all blocks will be listed. end - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli/tests 027.phpt
georg Tue Feb 17 02:45:15 2004 EDT
Modified files:
/php-src/ext/mysqli/tests 027.phpt
Log:
changed output
http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/027.phpt?r1=1.1r2=1.2ty=u
Index: php-src/ext/mysqli/tests/027.phpt
diff -u php-src/ext/mysqli/tests/027.phpt:1.1 php-src/ext/mysqli/tests/027.phpt:1.2
--- php-src/ext/mysqli/tests/027.phpt:1.1 Tue Feb 11 19:46:29 2003
+++ php-src/ext/mysqli/tests/027.phpt Tue Feb 17 02:45:15 2004
@@ -11,11 +11,10 @@
$status = mysqli_stat($link);
- $x = explode(' ', $status);
- var_dump(count($x));
+ var_dump(strlen($status) 0);
mysqli_close($link);
?
--EXPECT--
-int(10)
+bool(true)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
