[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri Jan 11 01:31:35 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2923r2=1.2924diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2923 php-src/ChangeLog:1.2924 --- php-src/ChangeLog:1.2923Thu Jan 10 01:31:31 2008 +++ php-src/ChangeLog Fri Jan 11 01:31:35 2008 @@ -1,3 +1,64 @@ +2008-01-10 Brian Shire [EMAIL PROTECTED] + +* (PHP_5_2) + ext/standard/http.c + ext/standard/http.c: + - MFH fix truncation of large values on 64-bit systems in http_build_query + +* ext/standard/http.c: + - fix truncation of large values on 64-bit systems in http_build_query + +2008-01-10 Rob Richards [EMAIL PROTECTED] + +* (PHP_5_3) + win32/build/confutils.js: + MFH: add errors when missing dependencies (Steph) + +* win32/build/confutils.js: + add errors when missing dependencies (Steph) + +2008-01-10 Antony Dovgal [EMAIL PROTECTED] + +* ext/standard/string.c: + fix #43750 (stristr() modifies string) + patch by Felipe Pena + +2008-01-10 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_3) + ext/spl/spl_iterators.c: + - MFH Fix bug in example code found by Surf Chen + +* ext/spl/spl_iterators.c: + - Fix bug in example code found by Surf Chen + +2008-01-10 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/zend_execute_API.c + ZendEngine2/zend_execute_API.c + ext/reflection/tests/bug42976.phpt + ext/reflection/tests/bug42976.phpt + ext/standard/tests/general_functions/bug41970.phpt + ext/standard/tests/general_functions/bug41970.phpt: + Added missing warning message + +2008-01-10 Antony Dovgal [EMAIL PROTECTED] + +* tests/basic/026.phpt + tests/basic/026.phpt: + fix test + +* (PHP_5_2) + tests/basic/026.phpt: + correct number of symbols + +2008-01-10 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_3) + tests/basic/026.phpt: + + Fixed test + 2008-01-09 Rob Richards [EMAIL PROTECTED] * (PHP_5_3)
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Fri Jan 11 01:31:38 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1219r2=1.1220diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1219 ZendEngine2/ChangeLog:1.1220 --- ZendEngine2/ChangeLog:1.1219Thu Jan 10 01:31:36 2008 +++ ZendEngine2/ChangeLog Fri Jan 11 01:31:38 2008 @@ -1,3 +1,9 @@ +2008-01-10 Dmitry Stogov [EMAIL PROTECTED] + +* zend_execute_API.c + zend_execute_API.c: + Added missing warning message + 2008-01-09 Dmitry Stogov [EMAIL PROTECTED] * (PHP_5_2) @@ -20646,7 +20652,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1219 2008/01/10 01:31:36 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1220 2008/01/11 01:31:38 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -22370,7 +22376,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1219 2008/01/10 01:31:36 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1220 2008/01/11 01:31:38 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/basic 026.phpt
tony2001Thu Jan 10 08:45:06 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/tests/basic026.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/tests/basic/026.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/tests/basic/026.phpt
diff -u php-src/tests/basic/026.phpt:1.1.2.1
php-src/tests/basic/026.phpt:1.1.2.2
--- php-src/tests/basic/026.phpt:1.1.2.1Mon May 7 23:27:59 2007
+++ php-src/tests/basic/026.phptThu Jan 10 08:45:06 2008
@@ -15,5 +15,4 @@
--EXPECT--
array(0) {
}
-string(10) a=1b=ZYX
-
\ No newline at end of file
+string(10) a=1b=ZYX
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/basic 026.phpt
tony2001Thu Jan 10 08:45:39 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/tests/basic026.phpt
Log:
correct number of symbols
http://cvs.php.net/viewvc.cgi/php-src/tests/basic/026.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/tests/basic/026.phpt
diff -u php-src/tests/basic/026.phpt:1.1.2.2
php-src/tests/basic/026.phpt:1.1.2.3
--- php-src/tests/basic/026.phpt:1.1.2.2Thu Jan 10 08:45:06 2008
+++ php-src/tests/basic/026.phptThu Jan 10 08:45:39 2008
@@ -15,4 +15,4 @@
--EXPECT--
array(0) {
}
-string(10) a=1b=ZYX
+string(9) a=1b=ZYX
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/basic 026.phpt
tony2001Thu Jan 10 08:45:54 2008 UTC
Modified files:
/php-src/tests/basic026.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/tests/basic/026.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/tests/basic/026.phpt
diff -u php-src/tests/basic/026.phpt:1.2 php-src/tests/basic/026.phpt:1.3
--- php-src/tests/basic/026.phpt:1.2Tue Jun 5 11:25:21 2007
+++ php-src/tests/basic/026.phptThu Jan 10 08:45:54 2008
@@ -15,10 +15,8 @@
--EXPECT--
array(0) {
}
-string(10) a=1b=ZYX
-
+string(9) a=1b=ZYX
--UEXPECT--
array(0) {
}
-unicode(10) a=1b=ZYX
-
+unicode(9) a=1b=ZYX
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection/tests bug42976.phpt /ext/standard/tests/general_functions bug41970.phpt ZendEngine2 zend_execute_API.c
dmitry Thu Jan 10 09:38:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2zend_execute_API.c
/php-src/ext/reflection/tests bug42976.phpt
/php-src/ext/standard/tests/general_functions bug41970.phpt
Log:
Added missing warning message
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.20.2.24.2.16r2=1.331.2.20.2.24.2.17diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.16
ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.17
--- ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.16 Mon Dec 31 07:17:04 2007
+++ ZendEngine2/zend_execute_API.c Thu Jan 10 09:38:23 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.16 2007/12/31 07:17:04
sebastian Exp $ */
+/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.17 2008/01/10 09:38:23 dmitry
Exp $ */
#include stdio.h
#include signal.h
@@ -944,6 +944,7 @@
if (ARG_SHOULD_BE_SENT_BY_REF(EX(function_state).function, i +
1)
!PZVAL_IS_REF(*fci-params[i])) {
+
if (Z_REFCOUNT_PP(fci-params[i]) 1) {
zval *new_zval;
@@ -958,8 +959,14 @@
zval_ptr_dtor(method_name);
zval_ptr_dtor(params_array);
}
+ zend_error(E_WARNING, Parameter %d to
%s%s%s() expected to be a reference, value given,
+ i+1,
+
EX(function_state).function-common.scope ?
EX(function_state).function-common.scope-name : ,
+
EX(function_state).function-common.scope ? :: : ,
+
EX(function_state).function-common.function_name);
return FAILURE;
}
+
ALLOC_ZVAL(new_zval);
*new_zval = **fci-params[i];
zval_copy_ctor(new_zval);
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug42976.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/reflection/tests/bug42976.phpt
diff -u php-src/ext/reflection/tests/bug42976.phpt:1.1.2.1
php-src/ext/reflection/tests/bug42976.phpt:1.1.2.2
--- php-src/ext/reflection/tests/bug42976.phpt:1.1.2.1 Sun Oct 28 13:42:24 2007
+++ php-src/ext/reflection/tests/bug42976.phpt Thu Jan 10 09:38:23 2008
@@ -26,9 +26,13 @@
--EXPECTF--
string(9) x.changed
-Warning: Invocation of C's constructor failed in %s/bug42976.php on line %d
+Warning: Parameter 1 to C::__construct() expected to be a reference, value
given in %sbug42976.php on line 15
+
+Warning: Invocation of C's constructor failed in %sbug42976.php on line 15
string(10) x.original
-Warning: Invocation of C's constructor failed in %s/bug42976.php on line %d
+Warning: Parameter 1 to C::__construct() expected to be a reference, value
given in %sbug42976.php on line 18
+
+Warning: Invocation of C's constructor failed in %sbug42976.php on line 18
string(10) x.original
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug41970.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug41970.phpt
diff -u php-src/ext/standard/tests/general_functions/bug41970.phpt:1.1.2.2
php-src/ext/standard/tests/general_functions/bug41970.phpt:1.1.2.3
--- php-src/ext/standard/tests/general_functions/bug41970.phpt:1.1.2.2 Fri Nov
2 19:42:51 2007
+++ php-src/ext/standard/tests/general_functions/bug41970.phpt Thu Jan 10
09:38:23 2008
@@ -12,13 +12,16 @@
echo Done\n;
?
---EXPECTF--
+--EXPECTF--
+Warning: Parameter 1 to sort() expected to be a reference, value given in
%sbug41970.php on line 5
NULL
-Notice: Array to string conversion in %s on line %d
+Notice: Array to string conversion in %sbug41970.php on line 6
int(5)
+
+Warning: Parameter 1 to sort() expected to be a reference, value given in
%sbug41970.php on line 7
NULL
-Notice: Array to string conversion in %s on line %d
+Notice: Array to string conversion in %sbug41970.php on line 8
int(5)
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection/tests bug42976.phpt /ext/standard/tests/general_functions bug41970.phpt ZendEngine2 zend_execute_API.c
dmitry Thu Jan 10 09:38:41 2008 UTC Modified files: /ZendEngine2zend_execute_API.c /php-src/ext/reflection/tests bug42976.phpt /php-src/ext/standard/tests/general_functions bug41970.phpt Log: Added missing warning message http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.427r2=1.428diff_format=u Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.427 ZendEngine2/zend_execute_API.c:1.428 --- ZendEngine2/zend_execute_API.c:1.427Mon Dec 31 07:12:06 2007 +++ ZendEngine2/zend_execute_API.c Thu Jan 10 09:38:40 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: zend_execute_API.c,v 1.427 2007/12/31 07:12:06 sebastian Exp $ */ +/* $Id: zend_execute_API.c,v 1.428 2008/01/10 09:38:40 dmitry Exp $ */ #include stdio.h #include signal.h @@ -1058,6 +1058,11 @@ zval_ptr_dtor(method_name); zval_ptr_dtor(params_array); } + zend_error(E_WARNING, Parameter %d to %v%s%v() expected to be a reference, value given, + i+1, + EX(function_state).function-common.scope ? EX(function_state).function-common.scope-name : EMPTY_ZSTR, + EX(function_state).function-common.scope ? :: : , + EX(function_state).function-common.function_name); return FAILURE; } ALLOC_ZVAL(new_zval); http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug42976.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/reflection/tests/bug42976.phpt diff -u php-src/ext/reflection/tests/bug42976.phpt:1.2 php-src/ext/reflection/tests/bug42976.phpt:1.3 --- php-src/ext/reflection/tests/bug42976.phpt:1.2 Sun Oct 28 13:44:09 2007 +++ php-src/ext/reflection/tests/bug42976.phpt Thu Jan 10 09:38:40 2008 @@ -26,9 +26,26 @@ --EXPECTF-- string(9) x.changed -Warning: Invocation of C's constructor failed in %s/bug42976.php on line %d +Warning: Parameter 1 to C::__construct() expected to be a reference, value given in %sbug42976.php on line 15 + +Warning: Invocation of C's constructor failed in %sbug42976.php on line 15 string(10) x.original -Warning: Invocation of C's constructor failed in %s/bug42976.php on line %d +Warning: Parameter 1 to C::__construct() expected to be a reference, value given in %sbug42976.php on line 18 + +Warning: Invocation of C's constructor failed in %sbug42976.php on line 18 string(10) x.original Done +--UEXPECTF-- +unicode(9) x.changed + +Warning: Parameter 1 to C::__construct() expected to be a reference, value given in %sbug42976.php on line 15 + +Warning: Invocation of C's constructor failed in %sbug42976.php on line 15 +unicode(10) x.original + +Warning: Parameter 1 to C::__construct() expected to be a reference, value given in %sbug42976.php on line 18 + +Warning: Invocation of C's constructor failed in %sbug42976.php on line 18 +unicode(10) x.original +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug41970.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/general_functions/bug41970.phpt diff -u php-src/ext/standard/tests/general_functions/bug41970.phpt:1.1 php-src/ext/standard/tests/general_functions/bug41970.phpt:1.2 --- php-src/ext/standard/tests/general_functions/bug41970.phpt:1.1 Thu Jul 12 09:19:04 2007 +++ php-src/ext/standard/tests/general_functions/bug41970.phpt Thu Jan 10 09:38:41 2008 @@ -12,13 +12,16 @@ echo Done\n; ? ---EXPECTF-- +--EXPECTF-- +Warning: Parameter 1 to sort() expected to be a reference, value given in %sbug41970.php on line 5 NULL -Notice: Array to string conversion in %s on line %d +Notice: Array to string conversion in %sbug41970.php on line 6 int(5) + +Warning: Parameter 1 to sort() expected to be a reference, value given in %sbug41970.php on line 7 NULL -Notice: Array to string conversion in %s on line %d +Notice: Array to string conversion in %sbug41970.php on line 8 int(5) Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Thu Jan 10 10:04:09 2008 UTC Modified files: /CVSROOTavail Log: - Francois karma for pecl/automap http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1344r2=1.1345diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1344 CVSROOT/avail:1.1345 --- CVSROOT/avail:1.1344Tue Jan 8 19:23:38 2008 +++ CVSROOT/avail Thu Jan 10 10:04:09 2008 @@ -287,7 +287,7 @@ avail|lwe|pecl/pdo_firebird,php-src/ext/pdo_firebird avail|mkoppanen|pecl/ssh2 avail|bdeshong|pecl/usblib -avail|francois|pecl/phk +avail|francois|pecl/phk,pecl/automap # Objective-C bridge avail|wez,jan|php-objc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_iterators.c
helly Thu Jan 10 10:11:21 2008 UTC
Modified files:
/php-src/ext/splspl_iterators.c
Log:
- Fix bug in example code found by Surf Chen
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.167r2=1.168diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.167
php-src/ext/spl/spl_iterators.c:1.168
--- php-src/ext/spl/spl_iterators.c:1.167 Mon Dec 31 07:12:15 2007
+++ php-src/ext/spl/spl_iterators.c Thu Jan 10 10:11:21 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.167 2007/12/31 07:12:15 sebastian Exp $ */
+/* $Id: spl_iterators.c,v 1.168 2008/01/10 10:11:21 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -860,6 +860,7 @@
func_params[current] = (zval **) p - (arg_count-current);
current++;
}
+ arg_count = current; /* restore */
if (call_user_function_ex(EG(function_table), NULL, func, retval_ptr,
arg_count, func_params, 0, NULL TSRMLS_CC) == SUCCESS retval_ptr) {
RETURN_ZVAL(retval_ptr, 0, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_iterators.c
helly Thu Jan 10 10:11:33 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/splspl_iterators.c
Log:
- MFH Fix bug in example code found by Surf Chen
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.28.2.5r2=1.73.2.30.2.28.2.6diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.5
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.6
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.5 Mon Dec 31 07:17:14 2007
+++ php-src/ext/spl/spl_iterators.c Thu Jan 10 10:11:33 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.5 2007/12/31 07:17:14 sebastian Exp
$ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.6 2008/01/10 10:11:33 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -857,6 +857,7 @@
func_params[current] = (zval **) p - (arg_count-current);
current++;
}
+ arg_count = current; /* restore */
if (call_user_function_ex(EG(function_table), NULL, func, retval_ptr,
arg_count, func_params, 0, NULL TSRMLS_CC) == SUCCESS retval_ptr) {
RETURN_ZVAL(retval_ptr, 0, 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 string.c
tony2001Thu Jan 10 14:31:11 2008 UTC
Modified files:
/php-src/ext/standard string.c
Log:
fix #43750 (stristr() modifies string)
patch by Felipe Pena
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.659r2=1.660diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.659 php-src/ext/standard/string.c:1.660
--- php-src/ext/standard/string.c:1.659 Mon Dec 31 07:12:16 2007
+++ php-src/ext/standard/string.c Thu Jan 10 14:31:11 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.659 2007/12/31 07:12:16 sebastian Exp $ */
+/* $Id: string.c,v 1.660 2008/01/10 14:31:11 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2526,6 +2526,9 @@
return;
}
+ SEPARATE_ZVAL(haystack);
+ SEPARATE_ZVAL(needle);
+
if (Z_TYPE_PP(haystack) != IS_UNICODE Z_TYPE_PP(haystack) !=
IS_STRING) {
convert_to_text_ex(haystack);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
rrichards Thu Jan 10 18:21:24 2008 UTC
Modified files:
/php-src/win32/buildconfutils.js
Log:
add errors when missing dependencies (Steph)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.70r2=1.71diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.70
php-src/win32/build/confutils.js:1.71
--- php-src/win32/build/confutils.js:1.70 Wed Nov 14 19:44:24 2007
+++ php-src/win32/build/confutils.jsThu Jan 10 18:21:23 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.70 2007/11/14 19:44:24 auroraeosrose Exp $
+// $Id: confutils.js,v 1.71 2008/01/10 18:21:23 rrichards Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1009,7 +1009,15 @@
ADD_FLAG(LDFLAGS_ + EXT, /libpath:$(BUILD_DIR));
ADD_FLAG(LIBS_ + EXT, php_ + dependson + .lib);
ADD_FLAG(DEPS_ + EXT, $(BUILD_DIR)\\php_ + dependson +
.lib);
- }
+ } else {
+ if (dep_present == no) {
+ if (ext_shared) {
+ WARNING(extname + has a missing dependency:
+ dependson);
+ } else {
+ ERROR(Cannot build + extname + ; +
dependson + not enabled);
+ }
+ }
+ } // dependency is statically built-in to PHP
}
function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js
rrichards Thu Jan 10 18:21:57 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js
Log:
MFH: add errors when missing dependencies (Steph)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.1r2=1.60.2.1.2.8.2.2diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.1
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.2
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.1 Wed Nov 14 19:38:57 2007
+++ php-src/win32/build/confutils.jsThu Jan 10 18:21:56 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.60.2.1.2.8.2.1 2007/11/14 19:38:57 auroraeosrose Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.2 2008/01/10 18:21:56 rrichards Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1009,7 +1009,15 @@
ADD_FLAG(LDFLAGS_ + EXT, /libpath:$(BUILD_DIR));
ADD_FLAG(LIBS_ + EXT, php_ + dependson + .lib);
ADD_FLAG(DEPS_ + EXT, $(BUILD_DIR)\\php_ + dependson +
.lib);
- }
+ } else {
+ if (dep_present == no) {
+ if (ext_shared) {
+ WARNING(extname + has a missing dependency:
+ dependson);
+ } else {
+ ERROR(Cannot build + extname + ; +
dependson + not enabled);
+ }
+ }
+ } // dependency is statically built-in to PHP
}
function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard http.c
shire Thu Jan 10 20:28:08 2008 UTC
Modified files:
/php-src/ext/standard http.c
Log:
- fix truncation of large values on 64-bit systems in http_build_query
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http.c?r1=1.28r2=1.29diff_format=u
Index: php-src/ext/standard/http.c
diff -u php-src/ext/standard/http.c:1.28 php-src/ext/standard/http.c:1.29
--- php-src/ext/standard/http.c:1.28Mon Dec 31 07:12:15 2007
+++ php-src/ext/standard/http.c Thu Jan 10 20:28:08 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: http.c,v 1.28 2007/12/31 07:12:15 sebastian Exp $ */
+/* $Id: http.c,v 1.29 2008/01/10 20:28:08 shire Exp $ */
#include php_http.h
#include php_ini.h
@@ -121,7 +121,7 @@
*p = '\0';
} else {
/* Is an integer key */
- ekey_len = spprintf(ekey, 12, %ld, idx);
+ ekey_len = spprintf(ekey, 0, %ld, idx);
newprefix_len = key_prefix_len + num_prefix_len
+ ekey_len + key_suffix_len + 3 /* %5B */;
newprefix = emalloc(newprefix_len + 1);
p = newprefix;
@@ -172,7 +172,7 @@
if (num_prefix) {
smart_str_appendl(formstr, num_prefix,
num_prefix_len);
}
- ekey_len = spprintf(ekey, 12, %ld, idx);
+ ekey_len = spprintf(ekey, 0, %ld, idx);
smart_str_appendl(formstr, ekey, ekey_len);
efree(ekey);
}
@@ -198,10 +198,10 @@
break;
case IS_LONG:
case IS_BOOL:
- ekey_len = spprintf(ekey, 12, %ld,
Z_LVAL_PP(zdata));
+ ekey_len = spprintf(ekey, 0, %ld,
Z_LVAL_PP(zdata));
break;
case IS_DOUBLE:
- ekey_len = spprintf(ekey, 48, %.*G,
(int) EG(precision), Z_DVAL_PP(zdata));
+ ekey_len = spprintf(ekey, 0, %.*G,
(int) EG(precision), Z_DVAL_PP(zdata));
break;
default:
/* fall back on convert to string */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard http.c
shire Thu Jan 10 20:29:12 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard http.c
Log:
- MFH fix truncation of large values on 64-bit systems in http_build_query
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http.c?r1=1.14.2.4.2.3.2.2r2=1.14.2.4.2.3.2.3diff_format=u
Index: php-src/ext/standard/http.c
diff -u php-src/ext/standard/http.c:1.14.2.4.2.3.2.2
php-src/ext/standard/http.c:1.14.2.4.2.3.2.3
--- php-src/ext/standard/http.c:1.14.2.4.2.3.2.2Mon Dec 31 07:17:15 2007
+++ php-src/ext/standard/http.c Thu Jan 10 20:29:12 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: http.c,v 1.14.2.4.2.3.2.2 2007/12/31 07:17:15 sebastian Exp $ */
+/* $Id: http.c,v 1.14.2.4.2.3.2.3 2008/01/10 20:29:12 shire Exp $ */
#include php_http.h
#include php_ini.h
@@ -105,7 +105,7 @@
*p = '\0';
} else {
/* Is an integer key */
- ekey_len = spprintf(ekey, 12, %ld, idx);
+ ekey_len = spprintf(ekey, 0, %ld, idx);
newprefix_len = key_prefix_len + num_prefix_len
+ ekey_len + key_suffix_len + 3 /* %5B */;
newprefix = emalloc(newprefix_len + 1);
p = newprefix;
@@ -153,7 +153,7 @@
if (num_prefix) {
smart_str_appendl(formstr, num_prefix,
num_prefix_len);
}
- ekey_len = spprintf(ekey, 12, %ld, idx);
+ ekey_len = spprintf(ekey, 0, %ld, idx);
smart_str_appendl(formstr, ekey, ekey_len);
efree(ekey);
}
@@ -165,10 +165,10 @@
break;
case IS_LONG:
case IS_BOOL:
- ekey_len = spprintf(ekey, 12, %ld,
Z_LVAL_PP(zdata));
+ ekey_len = spprintf(ekey, 0, %ld,
Z_LVAL_PP(zdata));
break;
case IS_DOUBLE:
- ekey_len = spprintf(ekey, 48, %.*G,
(int) EG(precision), Z_DVAL_PP(zdata));
+ ekey_len = spprintf(ekey, 0, %.*G,
(int) EG(precision), Z_DVAL_PP(zdata));
break;
default:
/* fall back on convert to string */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard http.c
shire Thu Jan 10 20:32:41 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard http.c
Log:
- MFH fix truncation of large values on 64-bit systems in http_build_query
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http.c?r1=1.14.2.4.2.5r2=1.14.2.4.2.6diff_format=u
Index: php-src/ext/standard/http.c
diff -u php-src/ext/standard/http.c:1.14.2.4.2.5
php-src/ext/standard/http.c:1.14.2.4.2.6
--- php-src/ext/standard/http.c:1.14.2.4.2.5Mon Dec 31 07:20:12 2007
+++ php-src/ext/standard/http.c Thu Jan 10 20:32:41 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: http.c,v 1.14.2.4.2.5 2007/12/31 07:20:12 sebastian Exp $ */
+/* $Id: http.c,v 1.14.2.4.2.6 2008/01/10 20:32:41 shire Exp $ */
#include php_http.h
#include php_ini.h
@@ -105,7 +105,7 @@
*p = '\0';
} else {
/* Is an integer key */
- ekey_len = spprintf(ekey, 12, %ld, idx);
+ ekey_len = spprintf(ekey, 0, %ld, idx);
newprefix_len = key_prefix_len + num_prefix_len
+ ekey_len + key_suffix_len + 3 /* %5B */;
newprefix = emalloc(newprefix_len + 1);
p = newprefix;
@@ -153,7 +153,7 @@
if (num_prefix) {
smart_str_appendl(formstr, num_prefix,
num_prefix_len);
}
- ekey_len = spprintf(ekey, 12, %ld, idx);
+ ekey_len = spprintf(ekey, 0, %ld, idx);
smart_str_appendl(formstr, ekey, ekey_len);
efree(ekey);
}
@@ -165,10 +165,10 @@
break;
case IS_LONG:
case IS_BOOL:
- ekey_len = spprintf(ekey, 12, %ld,
Z_LVAL_PP(zdata));
+ ekey_len = spprintf(ekey, 0, %ld,
Z_LVAL_PP(zdata));
break;
case IS_DOUBLE:
- ekey_len = spprintf(ekey, 48, %.*G,
(int) EG(precision), Z_DVAL_PP(zdata));
+ ekey_len = spprintf(ekey, 0, %.*G,
(int) EG(precision), Z_DVAL_PP(zdata));
break;
default:
/* fall back on convert to string */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_stmt.c
iliaa Fri Jan 11 01:47:18 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdopdo_stmt.c
Log:
Fixed a bug with PDO::FETCH_COLUMN|PDO::FETCH_GROUP mode when a column # by
which to group by data is specified.
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.8r2=1.118.2.38.2.24.2.9diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.8
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.9
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.8 Mon Dec 31 07:17:11 2007
+++ php-src/ext/pdo/pdo_stmt.c Fri Jan 11 01:47:18 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.8 2007/12/31 07:17:11 sebastian Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.9 2008/01/11 01:47:18 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -894,6 +894,7 @@
int flags = how PDO_FETCH_FLAGS, idx, old_arg_count = 0;
zend_class_entry *ce = NULL, *old_ce = NULL;
zval grp_val, *grp, **pgrp, *retval, *old_ctor_args = NULL;
+ int colno;
if (how == PDO_FETCH_USE_DEFAULT) {
how = stmt-default_fetch_type;
@@ -909,6 +910,12 @@
return 1;
}
+ if (flags PDO_FETCH_GROUP stmt-fetch.column == -1) {
+ colno = 1;
+ } else {
+ colno = stmt-fetch.column;
+ }
+
if (return_value) {
int i = 0;
@@ -945,8 +952,12 @@
break;
case PDO_FETCH_COLUMN:
- if (stmt-fetch.column = 0
stmt-fetch.column stmt-column_count) {
- fetch_value(stmt, return_value,
stmt-fetch.column, NULL TSRMLS_CC);
+ if (colno = 0 colno stmt-column_count) {
+ if (flags == PDO_FETCH_GROUP
stmt-fetch.column == -1) {
+ fetch_value(stmt, return_value,
1, NULL TSRMLS_CC);
+ } else {
+ fetch_value(stmt, return_value,
colno, NULL TSRMLS_CC);
+ }
if (!return_all) {
return 1;
} else {
@@ -1049,7 +1060,11 @@
if (return_all how != PDO_FETCH_KEY_PAIR) {
INIT_PZVAL(grp_val);
- fetch_value(stmt, grp_val, i, NULL TSRMLS_CC);
+ if (flags == PDO_FETCH_GROUP how == PDO_FETCH_COLUMN
stmt-fetch.column 0) {
+ fetch_value(stmt, grp_val, colno, NULL
TSRMLS_CC);
+ } else {
+ fetch_value(stmt, grp_val, i, NULL TSRMLS_CC);
+ }
convert_to_string(grp_val);
if (how == PDO_FETCH_COLUMN) {
i = stmt-column_count; /* no more data to
fetch */
@@ -1527,7 +1542,7 @@
switch(ZEND_NUM_ARGS()) {
case 0:
case 1:
- stmt-fetch.column = how PDO_FETCH_GROUP ? 1 : 0;
+ stmt-fetch.column = how PDO_FETCH_GROUP ? -1 : 0;
break;
case 2:
convert_to_long(arg2);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/pdo pdo_stmt.c
iliaa Fri Jan 11 01:47:55 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdopdo_stmt.c
/php-srcNEWS
Log:
MFB: Fixed a bug with PDO::FETCH_COLUMN|PDO::FETCH_GROUP mode when a column
# by which to group by data is specified.
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.29r2=1.118.2.38.2.30diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.29
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.30
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.29 Mon Dec 31 07:20:09 2007
+++ php-src/ext/pdo/pdo_stmt.c Fri Jan 11 01:47:55 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.29 2007/12/31 07:20:09 sebastian Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.30 2008/01/11 01:47:55 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -894,6 +894,7 @@
int flags = how PDO_FETCH_FLAGS, idx, old_arg_count = 0;
zend_class_entry *ce = NULL, *old_ce = NULL;
zval grp_val, *grp, **pgrp, *retval, *old_ctor_args = NULL;
+ int colno;
if (how == PDO_FETCH_USE_DEFAULT) {
how = stmt-default_fetch_type;
@@ -909,6 +910,12 @@
return 1;
}
+ if (flags PDO_FETCH_GROUP stmt-fetch.column == -1) {
+ colno = 1;
+ } else {
+ colno = stmt-fetch.column;
+ }
+
if (return_value) {
int i = 0;
@@ -945,8 +952,12 @@
break;
case PDO_FETCH_COLUMN:
- if (stmt-fetch.column = 0
stmt-fetch.column stmt-column_count) {
- fetch_value(stmt, return_value,
stmt-fetch.column, NULL TSRMLS_CC);
+ if (colno = 0 colno stmt-column_count) {
+ if (flags == PDO_FETCH_GROUP
stmt-fetch.column == -1) {
+ fetch_value(stmt, return_value,
1, NULL TSRMLS_CC);
+ } else {
+ fetch_value(stmt, return_value,
colno, NULL TSRMLS_CC);
+ }
if (!return_all) {
return 1;
} else {
@@ -1049,7 +1060,11 @@
if (return_all how != PDO_FETCH_KEY_PAIR) {
INIT_PZVAL(grp_val);
- fetch_value(stmt, grp_val, i, NULL TSRMLS_CC);
+ if (flags == PDO_FETCH_GROUP how == PDO_FETCH_COLUMN
stmt-fetch.column 0) {
+ fetch_value(stmt, grp_val, colno, NULL
TSRMLS_CC);
+ } else {
+ fetch_value(stmt, grp_val, i, NULL TSRMLS_CC);
+ }
convert_to_string(grp_val);
if (how == PDO_FETCH_COLUMN) {
i = stmt-column_count; /* no more data to
fetch */
@@ -1527,7 +1542,7 @@
switch(ZEND_NUM_ARGS()) {
case 0:
case 1:
- stmt-fetch.column = how PDO_FETCH_GROUP ? 1 : 0;
+ stmt-fetch.column = how PDO_FETCH_GROUP ? -1 : 0;
break;
case 2:
convert_to_long(arg2);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1050r2=1.2027.2.547.2.1051diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1050 php-src/NEWS:1.2027.2.547.2.1051
--- php-src/NEWS:1.2027.2.547.2.1050Wed Jan 9 07:57:23 2008
+++ php-src/NEWSFri Jan 11 01:47:55 2008
@@ -4,6 +4,8 @@
- Fixed weired behavior in CGI parameter parsing. (Dmitry, Hannes Magnusson)
- Fixed a safe_mode bypass in cURL identified by Maksymilian Arciemowicz.
(Ilia)
+- Fixed a bug with PDO::FETCH_COLUMN|PDO::FETCH_GROUP mode when a column # by
+ which to group by data is specified. (Ilia)
- Fixed bug #43793 (zlib filter is unable to auto-detect gzip/zlib file
headers).
(Greg)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_stmt.c
iliaa Fri Jan 11 01:48:19 2008 UTC
Modified files:
/php-src/ext/pdopdo_stmt.c
Log:
MFB: Fixed a bug with PDO::FETCH_COLUMN|PDO::FETCH_GROUP mode when a column
# by which to group by data is specified.
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.183r2=1.184diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.183 php-src/ext/pdo/pdo_stmt.c:1.184
--- php-src/ext/pdo/pdo_stmt.c:1.183Mon Dec 31 07:12:13 2007
+++ php-src/ext/pdo/pdo_stmt.c Fri Jan 11 01:48:19 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.183 2007/12/31 07:12:13 sebastian Exp $ */
+/* $Id: pdo_stmt.c,v 1.184 2008/01/11 01:48:19 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -860,6 +860,7 @@
int flags = how PDO_FETCH_FLAGS, idx, old_arg_count = 0;
zend_class_entry *ce = NULL, *old_ce = NULL;
zval grp_val, *grp, **pgrp, *retval, *old_ctor_args = NULL;
+ int colno;
how = how ~PDO_FETCH_FLAGS;
if (how == PDO_FETCH_USE_DEFAULT) {
@@ -875,6 +876,12 @@
return 1;
}
+ if (flags PDO_FETCH_GROUP stmt-fetch.column == -1) {
+ colno = 1;
+ } else {
+ colno = stmt-fetch.column;
+ }
+
if (return_value) {
int i = 0;
@@ -916,8 +923,12 @@
break;
case PDO_FETCH_COLUMN:
- if (stmt-fetch.column = 0
stmt-fetch.column stmt-column_count) {
- fetch_value(stmt, return_value,
stmt-fetch.column, NULL TSRMLS_CC);
+ if (colno = 0 colno stmt-column_count) {
+ if (flags == PDO_FETCH_GROUP
stmt-fetch.column == -1) {
+ fetch_value(stmt, return_value,
1, NULL TSRMLS_CC);
+ } else {
+ fetch_value(stmt, return_value,
colno, NULL TSRMLS_CC);
+ }
if (!return_all) {
return 1;
} else {
@@ -1020,7 +1031,11 @@
if (return_all) {
INIT_PZVAL(grp_val);
- fetch_value(stmt, grp_val, i, NULL TSRMLS_CC);
+ if (flags == PDO_FETCH_GROUP how == PDO_FETCH_COLUMN
stmt-fetch.column 0) {
+ fetch_value(stmt, grp_val, colno, NULL
TSRMLS_CC);
+ } else {
+ fetch_value(stmt, grp_val, i, NULL TSRMLS_CC);
+ }
convert_to_string(grp_val);
if (how == PDO_FETCH_COLUMN) {
i = stmt-column_count; /* no more data to
fetch */
@@ -1503,7 +1518,7 @@
switch(ZEND_NUM_ARGS()) {
case 0:
case 1:
- stmt-fetch.column = how PDO_FETCH_GROUP ? 1 : 0;
+ stmt-fetch.column = how PDO_FETCH_GROUP ? -1 : 0;
break;
case 2:
convert_to_long(arg2);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
