[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri Feb 1 01:31:26 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2944r2=1.2945diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2944 php-src/ChangeLog:1.2945 --- php-src/ChangeLog:1.2944Thu Jan 31 01:31:28 2008 +++ php-src/ChangeLog Fri Feb 1 01:31:25 2008 @@ -1,3 +1,161 @@ +2008-01-31 Christopher Jones [EMAIL PROTECTED] + +* ext/oci8/tests/bug37220.phpt + ext/oci8/tests/bug37220.phpt: + + New test for old, suspended bug + +2008-01-31 Rob Richards [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + BFN + +* (PHP_5_2) + ext/simplexml/simplexml.c + ext/simplexml/simplexml.c + ext/simplexml/tests/bug42369.phpt + ext/simplexml/tests/bug42369.phpt: + MFH: fix bug #42369 (Implicit conversion to string leaks memory) + add test + +* ext/simplexml/simplexml.c + ext/simplexml/tests/bug42369.phpt + ext/simplexml/tests/bug42369.phpt + ext/simplexml/tests/bug42369.phpt: + fix bug #42369 (Implicit conversion to string leaks memory) + add test + +2008-01-31 Rasmus Lerdorf [EMAIL PROTECTED] + +* (PHP_5_3) + ext/date/tests/bug43075.phpt + ext/date/tests/bug43960.phpt: + Typo + +* (PHP_5_3) + ext/date/tests/bug43075.phpt + ext/date/tests/bug43960.phpt: + These two tests both need a timezone + +2008-01-31 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_3) + ext/pdo/EXPERIMENTAL: + + PDO is hardly experimental + +2008-01-31 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + BFN + +2008-01-31 Christopher Jones [EMAIL PROTECTED] + +* (PHP_5_3) + ext/oci8/README: + Update test environement description. Typos + +2008-01-31 Nuno Lopes [EMAIL PROTECTED] + +* ext/imap/config.m4 + ext/imap/php_imap.c: + fix gcc 4 build + +* (PHP_5_3) + ext/imap/php_imap.c: + try to fix build with gcc 4: take #2 + +2008-01-31 Rasmus Lerdorf [EMAIL PROTECTED] + +* (PHP_5_3) + ext/standard/tests/file/005_variation-win32.phpt: + There are plenty of other non-Windows operating systems + +2008-01-31 Nuno Lopes [EMAIL PROTECTED] + +* (PHP_5_3) + ext/imap/config.m4: + try to fix build with gcc 4: take #1 + +2008-01-31 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_3) + ext/standard/type.c: + - fix flag handling in is_callable() + +2008-01-31 Rob Richards [EMAIL PROTECTED] + +* ext/spl/spl_directory.c: + fix win32 build + +2008-01-31 Marcus Boerger [EMAIL PROTECTED] + +* ext/spl/tests/dit_001.phpt: + - Fix test + +2008-01-31 Elizabeth Marie Smith [EMAIL PROTECTED] + +* (PHP_5_3) + ext/spl/spl_directory.c: + Fix windows build + +2008-01-31 Christopher Jones [EMAIL PROTECTED] + +* ext/oci8/tests/drcp_scope2.phpt + ext/oci8/tests/drcp_scope2.phpt + ext/oci8/tests/password.phpt + ext/oci8/tests/password_2.phpt + ext/oci8/tests/password_new.phpt + ext/oci8/tests/password_old.phpt: + + file drcp_scope2.phpt was initially added on branch PHP_5_3. + +* (PHP_5_3) + ext/oci8/README + ext/oci8/oci8.c + ext/oci8/oci8_interface.c + ext/oci8/oci8_statement.c + ext/oci8/package2.xml + ext/oci8/php_oci8_int.h + ext/oci8/tests/bug42841.phpt + ext/oci8/tests/debug.phpt + ext/oci8/tests/details.inc + ext/oci8/tests/drcp_characterset.phpt + ext/oci8/tests/drcp_characterset.phpt + ext/oci8/tests/drcp_conn_close1.phpt + ext/oci8/tests/drcp_conn_close1.phpt + ext/oci8/tests/drcp_conn_close2.phpt + ext/oci8/tests/drcp_conn_close2.phpt + ext/oci8/tests/drcp_connect1.phpt + ext/oci8/tests/drcp_connect1.phpt + ext/oci8/tests/drcp_connection_class.phpt + ext/oci8/tests/drcp_connection_class.phpt + ext/oci8/tests/drcp_functions.inc + ext/oci8/tests/drcp_functions.inc + ext/oci8/tests/drcp_newconnect.phpt + ext/oci8/tests/drcp_newconnect.phpt + ext/oci8/tests/drcp_pconn_close1.phpt + ext/oci8/tests/drcp_pconn_close1.phpt + ext/oci8/tests/drcp_pconn_close2.phpt + ext/oci8/tests/drcp_pconn_close2.phpt + ext/oci8/tests/drcp_privileged.phpt + ext/oci8/tests/drcp_privileged.phpt + ext/oci8/tests/drcp_scope1.phpt + ext/oci8/tests/drcp_scope1.phpt: + Merge DRCP FAN support. PHP6 sync will happen later + +* ext/oci8/tests/bug42841.phpt + ext/oci8/tests/bug42841.phpt + ext/oci8/tests/bug42841.phpt: +1.1.4; + file bug42841.phpt was initially added on branch PHP_5_2. + +* (PHP_5_2) + ext/oci8/oci8_statement.c: + Fixed bug #42841 (REF CURSOR and oci_new_cursor PHP crash) + 2008-01-30 Marcus Boerger [EMAIL PROTECTED] * ext/spl/spl_directory.c
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/gmp gmp.c
Hi Ilia,
Probably your fix is not accurate, because it breaks
ext/gmp/tests/021.phpt, however it shouldn't from my point of view.
BTW my math knowledge is not excellent.
Could you please take a look.
May be the fix should be done only for gmp_div_r() and shouldn't affect
other functions.
Thanks. Dmitry.
Ilia Alshanetsky wrote:
iliaa Wed Jan 30 18:27:04 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/gmp gmp.c
/php-src NEWS
Log:
MFB: Fixed bug #43981 (gmp_div_r() does not preserve the sign of 1st
argument)
http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/gmp.c?r1=1.49.2.2.2.12r2=1.49.2.2.2.13diff_format=u
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.49.2.2.2.12 php-src/ext/gmp/gmp.c:1.49.2.2.2.13
--- php-src/ext/gmp/gmp.c:1.49.2.2.2.12 Mon Dec 31 07:20:06 2007
+++ php-src/ext/gmp/gmp.c Wed Jan 30 18:27:03 2008
@@ -552,6 +552,9 @@
if (use_ui gmp_ui_op) {
if (allow_ui_return) {
long_result = gmp_ui_op(*gmpnum_result, *gmpnum_a,
(unsigned long)Z_LVAL_PP(b_arg));
+ if (mpz_sgn(*gmpnum_a) == -1) {
+ long_result = -long_result;
+ }
} else {
gmp_ui_op(*gmpnum_result, *gmpnum_a, (unsigned
long)Z_LVAL_PP(b_arg));
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1067r2=1.2027.2.547.2.1068diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1067 php-src/NEWS:1.2027.2.547.2.1068
--- php-src/NEWS:1.2027.2.547.2.1067Wed Jan 30 15:30:44 2008
+++ php-src/NEWSWed Jan 30 18:27:03 2008
@@ -8,6 +8,8 @@
which to group by data is specified. (Ilia)
- Upgraded PCRE to version 7.6 (Nuno)
+- Fixed bug #43981 (gmp_div_r() does not preserve the sign of 1st argument).
+ (Ilia)
- Fixed bug #43954 (Memory leak when sending the same HTTP status code
multiple times). (Scott)
- Fixed bug #43927 (koi8r is missing from html_entity_decode()).
--
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_directory.c
rrichards Thu Jan 31 11:09:50 2008 UTC
Modified files:
/php-src/ext/splspl_directory.c
Log:
fix win32 build
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.141r2=1.142diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.141
php-src/ext/spl/spl_directory.c:1.142
--- php-src/ext/spl/spl_directory.c:1.141 Wed Jan 30 23:49:49 2008
+++ php-src/ext/spl/spl_directory.c Thu Jan 31 11:09:50 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.141 2008/01/30 23:49:49 helly Exp $ */
+/* $Id: spl_directory.c,v 1.142 2008/01/31 11:09:50 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -168,10 +168,10 @@
{
if (intern-type == SPL_FS_DIR) {
if (php_stream_is(intern-u.dir.dirp ,php_glob_stream_ops)) {
+ zstr ret;
if (type) {
*type = IS_STRING;
}
- zstr ret;
ret.s = php_glob_stream_get_path(intern-u.dir.dirp, 0,
len);
return ret;
}
--
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 type.c
helly Thu Jan 31 11:21:15 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard type.c
Log:
- fix flag handling in is_callable()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/type.c?r1=1.30.2.2.2.3.2.1r2=1.30.2.2.2.3.2.2diff_format=u
Index: php-src/ext/standard/type.c
diff -u php-src/ext/standard/type.c:1.30.2.2.2.3.2.1
php-src/ext/standard/type.c:1.30.2.2.2.3.2.2
--- php-src/ext/standard/type.c:1.30.2.2.2.3.2.1Mon Dec 31 07:17:15 2007
+++ php-src/ext/standard/type.c Thu Jan 31 11:21:15 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: type.c,v 1.30.2.2.2.3.2.1 2007/12/31 07:17:15 sebastian Exp $ */
+/* $Id: type.c,v 1.30.2.2.2.3.2.2 2008/01/31 11:21:15 helly Exp $ */
#include php.h
#include php_incomplete_class.h
@@ -374,6 +374,7 @@
syntax = Z_BVAL_PP(syntax_only);
}
+ syntax = syntax ? IS_CALLABLE_CHECK_SYNTAX_ONLY : IS_CALLABLE_STRICT;
if (argc 2) {
retval = zend_is_callable(*var, syntax, name);
zval_dtor(*callable_name);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/gmp gmp.c
When I ran the tests on my machine here all the tests had passed. I'll
take a look again.
On 31-Jan-08, at 3:50 AM, Dmitry Stogov wrote:
Hi Ilia,
Probably your fix is not accurate, because it breaks ext/gmp/tests/
021.phpt, however it shouldn't from my point of view.
BTW my math knowledge is not excellent.
Could you please take a look.
May be the fix should be done only for gmp_div_r() and shouldn't
affect other functions.
Thanks. Dmitry.
Ilia Alshanetsky wrote:
iliaa Wed Jan 30 18:27:04 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/gmp gmp.c /php-src NEWS Log:
MFB: Fixed bug #43981 (gmp_div_r() does not preserve the sign of
1st
argument)
http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/gmp.c?r1=1.49.2.2.2.12r2=1.49.2.2.2.13diff_format=u
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.49.2.2.2.12 php-src/ext/gmp/gmp.c:
1.49.2.2.2.13
--- php-src/ext/gmp/gmp.c:1.49.2.2.2.12 Mon Dec 31 07:20:06 2007
+++ php-src/ext/gmp/gmp.c Wed Jan 30 18:27:03 2008
@@ -552,6 +552,9 @@
if (use_ui gmp_ui_op) {
if (allow_ui_return) {
long_result = gmp_ui_op(*gmpnum_result, *gmpnum_a, (unsigned
long)Z_LVAL_PP(b_arg));
+ if (mpz_sgn(*gmpnum_a) == -1) {
+ long_result = -long_result;
+ }
} else {
gmp_ui_op(*gmpnum_result, *gmpnum_a, (unsigned
long)Z_LVAL_PP(b_arg));
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1067r2=1.2027.2.547.2.1068diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1067 php-src/NEWS:1.2027.2.547.2.1068
--- php-src/NEWS:1.2027.2.547.2.1067Wed Jan 30 15:30:44 2008
+++ php-src/NEWSWed Jan 30 18:27:03 2008
@@ -8,6 +8,8 @@
which to group by data is specified. (Ilia)
- Upgraded PCRE to version 7.6 (Nuno)
+- Fixed bug #43981 (gmp_div_r() does not preserve the sign of 1st
argument).
+ (Ilia)
- Fixed bug #43954 (Memory leak when sending the same HTTP status
code
multiple times). (Scott)
- Fixed bug #43927 (koi8r is missing from html_entity_decode()).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Ilia Alshanetsky
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/gmp gmp.c
Dmitry,
I've just tried to run the test on a patched 5.3 system and the test
passes without any problems. Why is the test failing on your machine?
On 31-Jan-08, at 3:50 AM, Dmitry Stogov wrote:
Hi Ilia,
Probably your fix is not accurate, because it breaks ext/gmp/tests/
021.phpt, however it shouldn't from my point of view.
BTW my math knowledge is not excellent.
Could you please take a look.
May be the fix should be done only for gmp_div_r() and shouldn't
affect other functions.
Thanks. Dmitry.
Ilia Alshanetsky wrote:
iliaa Wed Jan 30 18:27:04 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/gmp gmp.c /php-src NEWS Log:
MFB: Fixed bug #43981 (gmp_div_r() does not preserve the sign of
1st
argument)
http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/gmp.c?r1=1.49.2.2.2.12r2=1.49.2.2.2.13diff_format=u
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.49.2.2.2.12 php-src/ext/gmp/gmp.c:
1.49.2.2.2.13
--- php-src/ext/gmp/gmp.c:1.49.2.2.2.12 Mon Dec 31 07:20:06 2007
+++ php-src/ext/gmp/gmp.c Wed Jan 30 18:27:03 2008
@@ -552,6 +552,9 @@
if (use_ui gmp_ui_op) {
if (allow_ui_return) {
long_result = gmp_ui_op(*gmpnum_result, *gmpnum_a, (unsigned
long)Z_LVAL_PP(b_arg));
+ if (mpz_sgn(*gmpnum_a) == -1) {
+ long_result = -long_result;
+ }
} else {
gmp_ui_op(*gmpnum_result, *gmpnum_a, (unsigned
long)Z_LVAL_PP(b_arg));
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1067r2=1.2027.2.547.2.1068diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1067 php-src/NEWS:1.2027.2.547.2.1068
--- php-src/NEWS:1.2027.2.547.2.1067Wed Jan 30 15:30:44 2008
+++ php-src/NEWSWed Jan 30 18:27:03 2008
@@ -8,6 +8,8 @@
which to group by data is specified. (Ilia)
- Upgraded PCRE to version 7.6 (Nuno)
+- Fixed bug #43981 (gmp_div_r() does not preserve the sign of 1st
argument).
+ (Ilia)
- Fixed bug #43954 (Memory leak when sending the same HTTP status
code
multiple times). (Scott)
- Fixed bug #43927 (koi8r is missing from html_entity_decode()).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Ilia Alshanetsky
--
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/imap config.m4
nlopess Thu Jan 31 18:30:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap config.m4
Log:
try to fix build with gcc 4: take #1
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.69.4.7r2=1.69.4.7.2.1diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.69.4.7
php-src/ext/imap/config.m4:1.69.4.7.2.1
--- php-src/ext/imap/config.m4:1.69.4.7 Sun Feb 11 09:25:32 2007
+++ php-src/ext/imap/config.m4 Thu Jan 31 18:30:42 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.69.4.7 2007/02/11 09:25:32 tony2001 Exp $
+dnl $Id: config.m4,v 1.69.4.7.2.1 2008/01/31 18:30:42 nlopess Exp $
dnl
AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -24,21 +24,27 @@
AC_DEFUN([PHP_IMAP_TEST_BUILD], [
PHP_TEST_BUILD([$1], [$2], [$3], [$4],
[
-void mm_log(void){}
-void mm_dlog(void){}
-void mm_flags(void){}
-void mm_fatal(void){}
-void mm_critical(void){}
-void mm_nocritical(void){}
-void mm_notify(void){}
-void mm_login(void){}
-void mm_diskerror(void){}
-void mm_status(void){}
-void mm_lsub(void){}
-void mm_list(void){}
-void mm_exists(void){}
-void mm_searched(void){}
-void mm_expunged(void){}
+#if defined(__GNUC__) __GNUC__ = 4
+# define PHP_IMAP_EXPORT __attribute__ ((visibility(default)))
+#else
+# define PHP_IMAP_EXPORT
+#endif
+
+PHP_IMAP_EXPORT void mm_log(void){}
+PHP_IMAP_EXPORT void mm_dlog(void){}
+PHP_IMAP_EXPORT void mm_flags(void){}
+PHP_IMAP_EXPORT void mm_fatal(void){}
+PHP_IMAP_EXPORT void mm_critical(void){}
+PHP_IMAP_EXPORT void mm_nocritical(void){}
+PHP_IMAP_EXPORT void mm_notify(void){}
+PHP_IMAP_EXPORT void mm_login(void){}
+PHP_IMAP_EXPORT void mm_diskerror(void){}
+PHP_IMAP_EXPORT void mm_status(void){}
+PHP_IMAP_EXPORT void mm_lsub(void){}
+PHP_IMAP_EXPORT void mm_list(void){}
+PHP_IMAP_EXPORT void mm_exists(void){}
+PHP_IMAP_EXPORT void mm_searched(void){}
+PHP_IMAP_EXPORT void mm_expunged(void){}
])
])
--
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/imap php_imap.c
nlopess Thu Jan 31 18:46:03 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap php_imap.c
Log:
try to fix build with gcc 4: take #2
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.2r2=1.208.2.7.2.26.2.3diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.2
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.3
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.2 Mon Dec 31 07:17:09 2007
+++ php-src/ext/imap/php_imap.c Thu Jan 31 18:46:03 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.2 2007/12/31 07:17:09 sebastian Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.3 2008/01/31 18:46:03 nlopess Exp $ */
#define IMAP41
@@ -66,6 +66,12 @@
#define SENDBUFLEN 16385
#endif
+#if defined(__GNUC__) __GNUC__ = 4
+# define PHP_IMAP_EXPORT __attribute__ ((visibility(default)))
+#else
+# define PHP_IMAP_EXPORT
+#endif
+
static void _php_make_header_object(zval *myzvalue, ENVELOPE *en TSRMLS_DC);
static void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC);
static void _php_imap_parse_address(ADDRESS *addresslist, char **fulladdress,
zval *paddress TSRMLS_DC);
@@ -4332,7 +4338,7 @@
/* {{{ Interfaces to C-client
*/
-void mm_searched(MAILSTREAM *stream, unsigned long number)
+PHP_IMAP_EXPORT void mm_searched(MAILSTREAM *stream, unsigned long number)
{
MESSAGELIST *cur = NIL;
TSRMLS_FETCH();
@@ -4352,20 +4358,20 @@
}
}
-void mm_exists(MAILSTREAM *stream, unsigned long number)
+PHP_IMAP_EXPORT void mm_exists(MAILSTREAM *stream, unsigned long number)
{
}
-void mm_expunged(MAILSTREAM *stream, unsigned long number)
+PHP_IMAP_EXPORT void mm_expunged(MAILSTREAM *stream, unsigned long number)
{
}
-void mm_flags(MAILSTREAM *stream, unsigned long number)
+PHP_IMAP_EXPORT void mm_flags(MAILSTREAM *stream, unsigned long number)
{
}
/* Author: CJH */
-void mm_notify(MAILSTREAM *stream, char *str, long errflg)
+PHP_IMAP_EXPORT void mm_notify(MAILSTREAM *stream, char *str, long errflg)
{
STRINGLIST *cur = NIL;
TSRMLS_FETCH();
@@ -4388,7 +4394,7 @@
}
}
-void mm_list(MAILSTREAM *stream, DTYPE delimiter, char *mailbox, long
attributes)
+PHP_IMAP_EXPORT void mm_list(MAILSTREAM *stream, DTYPE delimiter, char
*mailbox, long attributes)
{
STRINGLIST *cur=NIL;
FOBJECTLIST *ocur=NIL;
@@ -4435,7 +4441,7 @@
}
}
-void mm_lsub(MAILSTREAM *stream, DTYPE delimiter, char *mailbox, long
attributes)
+PHP_IMAP_EXPORT void mm_lsub(MAILSTREAM *stream, DTYPE delimiter, char
*mailbox, long attributes)
{
STRINGLIST *cur=NIL;
FOBJECTLIST *ocur=NIL;
@@ -4479,7 +4485,7 @@
}
}
-void mm_status(MAILSTREAM *stream, char *mailbox, MAILSTATUS *status)
+PHP_IMAP_EXPORT void mm_status(MAILSTREAM *stream, char *mailbox, MAILSTATUS
*status)
{
TSRMLS_FETCH();
@@ -4501,7 +4507,7 @@
}
}
-void mm_log(char *str, long errflg)
+PHP_IMAP_EXPORT void mm_log(char *str, long errflg)
{
ERRORLIST *cur = NIL;
TSRMLS_FETCH();
@@ -4527,14 +4533,14 @@
}
}
-void mm_dlog(char *str)
+PHP_IMAP_EXPORT void mm_dlog(char *str)
{
/* CJH: this is for debugging; it might be useful to allow setting
the stream to debug mode and capturing this somewhere - syslog?
php debugger? */
}
-void mm_login(NETMBX *mb, char *user, char *pwd, long trial)
+PHP_IMAP_EXPORT void mm_login(NETMBX *mb, char *user, char *pwd, long trial)
{
TSRMLS_FETCH();
@@ -4546,20 +4552,20 @@
strlcpy (pwd, IMAPG(imap_password), MAILTMPLEN);
}
-void mm_critical(MAILSTREAM *stream)
+PHP_IMAP_EXPORT void mm_critical(MAILSTREAM *stream)
{
}
-void mm_nocritical(MAILSTREAM *stream)
+PHP_IMAP_EXPORT void mm_nocritical(MAILSTREAM *stream)
{
}
-long mm_diskerror(MAILSTREAM *stream, long errcode, long serious)
+PHP_IMAP_EXPORT long mm_diskerror(MAILSTREAM *stream, long errcode, long
serious)
{
return 1;
}
-void mm_fatal(char *str)
+PHP_IMAP_EXPORT void mm_fatal(char *str)
{
}
/* }}} */
--
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/tests/file 005_variation-win32.phpt
rasmus Thu Jan 31 18:31:55 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/file005_variation-win32.phpt
Log:
There are plenty of other non-Windows operating systems
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/005_variation-win32.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u
Index: php-src/ext/standard/tests/file/005_variation-win32.phpt
diff -u php-src/ext/standard/tests/file/005_variation-win32.phpt:1.1.2.1
php-src/ext/standard/tests/file/005_variation-win32.phpt:1.1.2.1.2.1
--- php-src/ext/standard/tests/file/005_variation-win32.phpt:1.1.2.1Mon Jun
11 16:14:59 2007
+++ php-src/ext/standard/tests/file/005_variation-win32.phptThu Jan 31
18:31:54 2008
@@ -3,7 +3,7 @@
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) != 'WIN') {
-die('skip Do not run on Linux');
+die('skip Windows-only test');
}
?
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap config.m4 php_imap.c
nlopess Thu Jan 31 18:48:01 2008 UTC
Modified files:
/php-src/ext/imap config.m4 php_imap.c
Log:
fix gcc 4 build
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.76r2=1.77diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.76 php-src/ext/imap/config.m4:1.77
--- php-src/ext/imap/config.m4:1.76 Sun Feb 11 09:25:25 2007
+++ php-src/ext/imap/config.m4 Thu Jan 31 18:48:00 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.76 2007/02/11 09:25:25 tony2001 Exp $
+dnl $Id: config.m4,v 1.77 2008/01/31 18:48:00 nlopess Exp $
dnl
AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -24,21 +24,27 @@
AC_DEFUN([PHP_IMAP_TEST_BUILD], [
PHP_TEST_BUILD([$1], [$2], [$3], [$4],
[
-void mm_log(void){}
-void mm_dlog(void){}
-void mm_flags(void){}
-void mm_fatal(void){}
-void mm_critical(void){}
-void mm_nocritical(void){}
-void mm_notify(void){}
-void mm_login(void){}
-void mm_diskerror(void){}
-void mm_status(void){}
-void mm_lsub(void){}
-void mm_list(void){}
-void mm_exists(void){}
-void mm_searched(void){}
-void mm_expunged(void){}
+#if defined(__GNUC__) __GNUC__ = 4
+# define PHP_IMAP_EXPORT __attribute__ ((visibility(default)))
+#else
+# define PHP_IMAP_EXPORT
+#endif
+
+PHP_IMAP_EXPORT void mm_log(void){}
+PHP_IMAP_EXPORT void mm_dlog(void){}
+PHP_IMAP_EXPORT void mm_flags(void){}
+PHP_IMAP_EXPORT void mm_fatal(void){}
+PHP_IMAP_EXPORT void mm_critical(void){}
+PHP_IMAP_EXPORT void mm_nocritical(void){}
+PHP_IMAP_EXPORT void mm_notify(void){}
+PHP_IMAP_EXPORT void mm_login(void){}
+PHP_IMAP_EXPORT void mm_diskerror(void){}
+PHP_IMAP_EXPORT void mm_status(void){}
+PHP_IMAP_EXPORT void mm_lsub(void){}
+PHP_IMAP_EXPORT void mm_list(void){}
+PHP_IMAP_EXPORT void mm_exists(void){}
+PHP_IMAP_EXPORT void mm_searched(void){}
+PHP_IMAP_EXPORT void mm_expunged(void){}
])
])
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.242r2=1.243diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.242 php-src/ext/imap/php_imap.c:1.243
--- php-src/ext/imap/php_imap.c:1.242 Mon Dec 31 07:12:10 2007
+++ php-src/ext/imap/php_imap.c Thu Jan 31 18:48:00 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_imap.c,v 1.242 2007/12/31 07:12:10 sebastian Exp $ */
+/* $Id: php_imap.c,v 1.243 2008/01/31 18:48:00 nlopess Exp $ */
#define IMAP41
@@ -66,6 +66,12 @@
#define SENDBUFLEN 16385
#endif
+#if defined(__GNUC__) __GNUC__ = 4
+# define PHP_IMAP_EXPORT __attribute__ ((visibility(default)))
+#else
+# define PHP_IMAP_EXPORT
+#endif
+
static void _php_make_header_object(zval *myzvalue, ENVELOPE *en TSRMLS_DC);
static void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC);
static void _php_imap_parse_address(ADDRESS *addresslist, char **fulladdress,
zval *paddress TSRMLS_DC);
@@ -4331,7 +4337,7 @@
/* {{{ Interfaces to C-client
*/
-void mm_searched(MAILSTREAM *stream, unsigned long number)
+PHP_IMAP_EXPORT void mm_searched(MAILSTREAM *stream, unsigned long number)
{
MESSAGELIST *cur = NIL;
TSRMLS_FETCH();
@@ -4351,20 +4357,20 @@
}
}
-void mm_exists(MAILSTREAM *stream, unsigned long number)
+PHP_IMAP_EXPORT void mm_exists(MAILSTREAM *stream, unsigned long number)
{
}
-void mm_expunged(MAILSTREAM *stream, unsigned long number)
+PHP_IMAP_EXPORT void mm_expunged(MAILSTREAM *stream, unsigned long number)
{
}
-void mm_flags(MAILSTREAM *stream, unsigned long number)
+PHP_IMAP_EXPORT void mm_flags(MAILSTREAM *stream, unsigned long number)
{
}
/* Author: CJH */
-void mm_notify(MAILSTREAM *stream, char *str, long errflg)
+PHP_IMAP_EXPORT void mm_notify(MAILSTREAM *stream, char *str, long errflg)
{
STRINGLIST *cur = NIL;
TSRMLS_FETCH();
@@ -4387,7 +4393,7 @@
}
}
-void mm_list(MAILSTREAM *stream, DTYPE delimiter, char *mailbox, long
attributes)
+PHP_IMAP_EXPORT void mm_list(MAILSTREAM *stream, DTYPE delimiter, char
*mailbox, long attributes)
{
STRINGLIST *cur=NIL;
FOBJECTLIST *ocur=NIL;
@@ -4434,7 +4440,7 @@
}
}
-void mm_lsub(MAILSTREAM *stream, DTYPE delimiter, char *mailbox, long
attributes)
+PHP_IMAP_EXPORT void mm_lsub(MAILSTREAM *stream, DTYPE delimiter, char
*mailbox, long attributes)
{
STRINGLIST *cur=NIL;
FOBJECTLIST *ocur=NIL;
@@ -4478,7 +4484,7 @@
}
}
-void mm_status(MAILSTREAM *stream, char *mailbox, MAILSTATUS *status)
+PHP_IMAP_EXPORT void mm_status(MAILSTREAM *stream, char *mailbox, MAILSTATUS
*status)
{
TSRMLS_FETCH();
@@ -4500,7 +4506,7 @@
}
}
-void mm_log(char *str, long errflg)
+PHP_IMAP_EXPORT void mm_log(char *str, long errflg)
{
ERRORLIST *cur =
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8 README
sixdThu Jan 31 20:21:27 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/oci8 README Log: Update test environement description. Typos http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/README?r1=1.1.2.2.2.1.2.1r2=1.1.2.2.2.1.2.2diff_format=u Index: php-src/ext/oci8/README diff -u php-src/ext/oci8/README:1.1.2.2.2.1.2.1 php-src/ext/oci8/README:1.1.2.2.2.1.2.2 --- php-src/ext/oci8/README:1.1.2.2.2.1.2.1 Thu Jan 31 01:33:29 2008 +++ php-src/ext/oci8/README Thu Jan 31 20:21:27 2008 @@ -99,6 +99,10 @@ If the database is on the same machine as PHP, set $oracle_on_localhost to TRUE. + If Oracle 11g Database Resident Connection Pooling is being tested, + set $test_drcp to TRUE and ensure the connection string uses an + appropriate pooled server (see section 6.2.2). + An alternative to editing details.inc is the set the environment variables @@ -106,6 +110,7 @@ PHP_OCI8_TEST_PASS PHP_OCI8_TEST_DB PHP_OCI8_TEST_DB_ON_LOCALHOST +PHP_OCI8_TEST_DRCP for example: @@ -113,6 +118,7 @@ $ export PHP_OCI8_TEST_PASS=oracle $ export PHP_OCI8_TEST_DB=localhost/XE $ export PHP_OCI8_TEST_DB_ON_LOCALHOST=TRUE +$ export PHP_OCI8_TEST_DRCP=FALSE 5.1.2. Set any necessary environment variables for the Oracle database. With Oracle 10g XE do: @@ -160,7 +166,7 @@ 6. DRCP and FAN Support --- -Th PHP OCI8 Beta extension has support for the Oracle Database +The PHP 5.3 OCI8 Beta extension has support for the Oracle Database Resident Connection Pool (DRCP) and Fast Application Notification (FAN). @@ -292,7 +298,7 @@ 6.3.4. Run your application, connecting to a 10gR2 or 11g database. -6.4. Changes and Known Issues in this release from PECL OCI8 1.3.0 Beta +6.4. Changes in this release from PECL OCI8 1.3.0 Beta The initial release of OCI8 with DRCP and FAN support was PECL OCI8 1.3.0 Beta. This section documents differences from that release. @@ -330,11 +336,11 @@ 6.4.3 Oci8.max_persistent setting is re-enabled. The php.ini parameter oci8.max_persistent will limit the number of -persistent connctions that each PHP process will keep open between +persistent connections that each PHP process will keep open between HTTP requests. Any further oci_pconnect() calls once this limit is reached will be treated as oci_connect() calls. -Is it still recommended that DRCP users modify the connection pool +It is still recommended that DRCP users modify the connection pool settings of the database to control resource usage. Non-DRCP users should consider setting oci8.persistent_timeout to close idle connections. -- 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
tony2001Thu Jan 31 20:23:33 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1068r2=1.2027.2.547.2.1069diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1068 php-src/NEWS:1.2027.2.547.2.1069 --- php-src/NEWS:1.2027.2.547.2.1068Wed Jan 30 18:27:03 2008 +++ php-src/NEWSThu Jan 31 20:23:33 2008 @@ -92,6 +92,7 @@ - Fixed bug #42945 (preg_split() swallows part of the string). (Nuno) - Fixed bug #42937 (__call() method not invoked when methods are called on parent from child class). (Dmitry) +- Fixed bug #42841 (REF CURSOR and oci_new_cursor() crash PHP). (Chris) - Fixed bug #42779 (Incorrect forcing from HTTP/1.0 request to HTTP/1.1 response). (Ilia) - Fixed bug #42736 (xmlrpc_server_call_method() crashes). (Tony) -- 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 EXPERIMENTAL
iliaa Thu Jan 31 20:50:27 2008 UTC Removed files: (Branch: PHP_5_3) /php-src/ext/pdoEXPERIMENTAL Log: PDO is hardly experimental -- 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/date/tests bug43075.phpt bug43960.phpt
rasmus Thu Jan 31 21:03:32 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date/tests bug43075.phpt bug43960.phpt
Log:
These two tests both need a timezone
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug43075.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/date/tests/bug43075.phpt
diff -u php-src/ext/date/tests/bug43075.phpt:1.1.2.2
php-src/ext/date/tests/bug43075.phpt:1.1.2.3
--- php-src/ext/date/tests/bug43075.phpt:1.1.2.2Thu Jan 17 20:45:08 2008
+++ php-src/ext/date/tests/bug43075.phptThu Jan 31 21:03:32 2008
@@ -1,5 +1,7 @@
--TEST--
Bug #43075 (Support 24 as hour)
+-INI--
+date.timezone=UTC
--FILE--
?php
$d = date_create(2007-11-01T24:34:00+00:00);
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug43960.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/date/tests/bug43960.phpt
diff -u php-src/ext/date/tests/bug43960.phpt:1.1.2.2
php-src/ext/date/tests/bug43960.phpt:1.1.2.3
--- php-src/ext/date/tests/bug43960.phpt:1.1.2.2Tue Jan 29 20:10:24 2008
+++ php-src/ext/date/tests/bug43960.phptThu Jan 31 21:03:32 2008
@@ -1,5 +1,7 @@
--TEST--
Bug #43960 (strtotime() returns timestamp in the future when given a bogus
string)
+-INI--
+date.timezone=UTC
--FILE--
?php
var_dump(strtotime('i like to eat slices at work'));
--
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/date/tests bug43075.phpt bug43960.phpt
rasmus Thu Jan 31 21:36:40 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/date/tests bug43075.phpt bug43960.phpt Log: Typo http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug43075.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u Index: php-src/ext/date/tests/bug43075.phpt diff -u php-src/ext/date/tests/bug43075.phpt:1.1.2.3 php-src/ext/date/tests/bug43075.phpt:1.1.2.4 --- php-src/ext/date/tests/bug43075.phpt:1.1.2.3Thu Jan 31 21:03:32 2008 +++ php-src/ext/date/tests/bug43075.phptThu Jan 31 21:36:40 2008 @@ -1,6 +1,6 @@ --TEST-- Bug #43075 (Support 24 as hour) --INI-- +--INI-- date.timezone=UTC --FILE-- ?php http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug43960.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u Index: php-src/ext/date/tests/bug43960.phpt diff -u php-src/ext/date/tests/bug43960.phpt:1.1.2.3 php-src/ext/date/tests/bug43960.phpt:1.1.2.4 --- php-src/ext/date/tests/bug43960.phpt:1.1.2.3Thu Jan 31 21:03:32 2008 +++ php-src/ext/date/tests/bug43960.phptThu Jan 31 21:36:40 2008 @@ -1,6 +1,6 @@ --TEST-- Bug #43960 (strtotime() returns timestamp in the future when given a bogus string) --INI-- +--INI-- date.timezone=UTC --FILE-- ?php -- 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 bug42369.phpt
rrichards Thu Jan 31 21:58:09 2008 UTC
Added files:
/php-src/ext/simplexml/testsbug42369.phpt
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
fix bug #42369 (Implicit conversion to string leaks memory)
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.251r2=1.252diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.251
php-src/ext/simplexml/simplexml.c:1.252
--- php-src/ext/simplexml/simplexml.c:1.251 Tue Jan 29 09:59:53 2008
+++ php-src/ext/simplexml/simplexml.c Thu Jan 31 21:58:09 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.251 2008/01/29 09:59:53 dmitry Exp $ */
+/* $Id: simplexml.c,v 1.252 2008/01/31 21:58:09 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1844,6 +1844,11 @@
}
}
+ if (readobj == writeobj) {
+ INIT_PZVAL(writeobj);
+ zval_dtor(readobj);
+ }
+
rv = cast_object(writeobj, type, (char *)contents, extra TSRMLS_CC);
if (contents) {
@@ -2544,7 +2549,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.251 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.252 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug42369.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug42369.phpt
+++ php-src/ext/simplexml/tests/bug42369.phpt
--TEST--
Bug #42369 (Implicit conversion to string leaks memory)
--SKIPIF--
?php if (!extension_loaded('simplexml')) echo 'skip simplexml extension is not
loaded';
--FILE--
?php
$xml = '?xml version=1.0 encoding=utf-8?';
$x = simplexml_load_string($xml . qxfoo/x/q);
echo 'explicit conversion' . PHP_EOL;
for ($i = 0; $i 10; $i++) {
md5(strval($x-x));
}
echo 'no conversion' . PHP_EOL;
for ($i = 0; $i 10; $i++) {
md5($x-x);
}
echo 'done' . PHP_EOL;
?
--EXPECT--
explicit conversion
no conversion
done
--
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/simplexml simplexml.c /ext/simplexml/tests bug42369.phpt
rrichards Thu Jan 31 21:58:57 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/simplexml/testsbug42369.phpt
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
MFH: fix bug #42369 (Implicit conversion to string leaks memory)
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.9r2=1.151.2.22.2.35.2.10diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.9
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.10
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.9 Tue Jan 29
09:59:42 2008
+++ php-src/ext/simplexml/simplexml.c Thu Jan 31 21:58:57 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.35.2.9 2008/01/29 09:59:42 dmitry Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.35.2.10 2008/01/31 21:58:57 rrichards Exp $
*/
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1787,6 +1787,11 @@
}
}
+ if (readobj == writeobj) {
+ INIT_PZVAL(writeobj);
+ zval_dtor(readobj);
+ }
+
rv = cast_object(writeobj, type, (char *)contents TSRMLS_CC);
if (contents) {
@@ -2507,7 +2512,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.35.2.9
$);
+ php_info_print_table_row(2, Revision, $Revision:
1.151.2.22.2.35.2.10 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug42369.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug42369.phpt
+++ php-src/ext/simplexml/tests/bug42369.phpt
--TEST--
Bug #42369 (Implicit conversion to string leaks memory)
--SKIPIF--
?php if (!extension_loaded('simplexml')) echo 'skip simplexml extension is not
loaded';
--FILE--
?php
$xml = '?xml version=1.0 encoding=utf-8?';
$x = simplexml_load_string($xml . qxfoo/x/q);
echo 'explicit conversion' . PHP_EOL;
for ($i = 0; $i 10; $i++) {
md5(strval($x-x));
}
echo 'no conversion' . PHP_EOL;
for ($i = 0; $i 10; $i++) {
md5($x-x);
}
echo 'done' . PHP_EOL;
?
--EXPECT--
explicit conversion
no conversion
done
--
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/simplexml simplexml.c /ext/simplexml/tests bug42369.phpt
rrichards Thu Jan 31 21:59:42 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/simplexml/testsbug42369.phpt
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
MFH: fix bug #42369 (Implicit conversion to string leaks memory)
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.37r2=1.151.2.22.2.38diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.37
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.38
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.37 Mon Dec 31 07:20:11 2007
+++ php-src/ext/simplexml/simplexml.c Thu Jan 31 21:59:41 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.37 2007/12/31 07:20:11 sebastian Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.38 2008/01/31 21:59:41 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1740,6 +1740,11 @@
}
}
+ if (readobj == writeobj) {
+ INIT_PZVAL(writeobj);
+ zval_dtor(readobj);
+ }
+
rv = cast_object(writeobj, type, (char *)contents TSRMLS_CC);
if (contents) {
@@ -2447,7 +2452,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.37 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.38 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug42369.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug42369.phpt
+++ php-src/ext/simplexml/tests/bug42369.phpt
--TEST--
Bug #42369 (Implicit conversion to string leaks memory)
--SKIPIF--
?php if (!extension_loaded('simplexml')) echo 'skip simplexml extension is not
loaded';
--FILE--
?php
$xml = '?xml version=1.0 encoding=utf-8?';
$x = simplexml_load_string($xml . qxfoo/x/q);
echo 'explicit conversion' . PHP_EOL;
for ($i = 0; $i 10; $i++) {
md5(strval($x-x));
}
echo 'no conversion' . PHP_EOL;
for ($i = 0; $i 10; $i++) {
md5($x-x);
}
echo 'done' . PHP_EOL;
?
--EXPECT--
explicit conversion
no conversion
done
--
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
rrichards Thu Jan 31 22:00:22 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1069r2=1.2027.2.547.2.1070diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1069 php-src/NEWS:1.2027.2.547.2.1070 --- php-src/NEWS:1.2027.2.547.2.1069Thu Jan 31 20:23:33 2008 +++ php-src/NEWSThu Jan 31 22:00:22 2008 @@ -99,6 +99,8 @@ - Fixed bug #42692 (Procedure 'int1' not present with doc/lit SoapServer). (Dmitry) - Fixed bug #42548 (mysqli PROCEDURE calls can't return result sets). (hartmut) +- Fixed bug #42369 (Implicit conversion to string leaks memory). + (David C., Rob). - Fixed bug #42272 (var_export() incorrectly escapes char(0)). (Derick) - Fixed bug #42261 (Incorrect lengths for date and boolean data types). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8/tests bug37220.phpt
sixdThu Jan 31 22:02:09 2008 UTC
Added files:
/php-src/ext/oci8/tests bug37220.phpt
Log:
New test for old, suspended bug
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/bug37220.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/bug37220.phpt
+++ php-src/ext/oci8/tests/bug37220.phpt
--TEST--
Bug #37220 (LOB Type mismatch when using windows oci8.dll)
--SKIPIF--
?php if (!extension_loaded(oci8)) print skip; ?
--FILE--
?php
require dirname(__FILE__).'/connect.inc';
// Initialization
$stmtarray = array(
create table bug37220_tab( mycolumn xmltype not null),
insert into bug37220_tab values(xmltype('THETAG
myID=\1234\/THETAG'))
);
foreach ($stmtarray as $stmt) {
$s = oci_parse($c, $stmt);
@oci_execute($s);
}
// Now let's update the row where myId = 1234 and change the tag
// 'THETAG' to 'MYTAG' (mycolumn is an XMLTYPE datatype and
// bug37220_tab a normal Oracle table)
$query = UPDATE bug37220_tab
SET bug37220_tab.mycolumn =
updateXML(bug37220_tab.mycolumn,'/THETAG',xmltype.createXML(:data))
WHERE existsNode(bug37220_tab.mycolumn,'/[EMAIL
PROTECTED]1234\]') = 1;
$stmt = oci_parse ($c, $query);
$clob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($stmt, ':data', $clob, -1, OCI_B_CLOB);
$clob-writetemporary(MYTAG/, OCI_TEMP_CLOB);
$success = oci_execute($stmt, OCI_COMMIT_ON_SUCCESS);
oci_free_statement($stmt);
$clob-close();
// Query back the change
$query = select * from bug37220_tab;
$stmt = oci_parse ($c, $query);
oci_execute($stmt);
while ($row = oci_fetch_array($stmt, OCI_ASSOC+OCI_RETURN_NULLS)) {
foreach ($row as $item) {
echo $item.\n;
}
echo \n;
}
// Cleanup
$stmtarray = array(
drop table bug37220_tab
);
foreach ($stmtarray as $stmt) {
$s = oci_parse($c, $stmt);
oci_execute($s);
}
echo Done\n;
?
--EXPECT--
MYTAG/
Done
--
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/oci8/tests bug37220.phpt
sixdThu Jan 31 22:03:23 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/oci8/tests bug37220.phpt
Log:
MFH: New test for old, suspended bug
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/bug37220.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/bug37220.phpt
+++ php-src/ext/oci8/tests/bug37220.phpt
--TEST--
Bug #37220 (LOB Type mismatch when using windows oci8.dll)
--SKIPIF--
?php if (!extension_loaded(oci8)) print skip; ?
--FILE--
?php
require dirname(__FILE__).'/connect.inc';
// Initialization
$stmtarray = array(
create table bug37220_tab( mycolumn xmltype not null),
insert into bug37220_tab values(xmltype('THETAG
myID=\1234\/THETAG'))
);
foreach ($stmtarray as $stmt) {
$s = oci_parse($c, $stmt);
@oci_execute($s);
}
// Now let's update the row where myId = 1234 and change the tag
// 'THETAG' to 'MYTAG' (mycolumn is an XMLTYPE datatype and
// bug37220_tab a normal Oracle table)
$query = UPDATE bug37220_tab
SET bug37220_tab.mycolumn =
updateXML(bug37220_tab.mycolumn,'/THETAG',xmltype.createXML(:data))
WHERE existsNode(bug37220_tab.mycolumn,'/[EMAIL
PROTECTED]1234\]') = 1;
$stmt = oci_parse ($c, $query);
$clob = oci_new_descriptor($c, OCI_D_LOB);
oci_bind_by_name($stmt, ':data', $clob, -1, OCI_B_CLOB);
$clob-writetemporary(MYTAG/, OCI_TEMP_CLOB);
$success = oci_execute($stmt, OCI_COMMIT_ON_SUCCESS);
oci_free_statement($stmt);
$clob-close();
// Query back the change
$query = select * from bug37220_tab;
$stmt = oci_parse ($c, $query);
oci_execute($stmt);
while ($row = oci_fetch_array($stmt, OCI_ASSOC+OCI_RETURN_NULLS)) {
foreach ($row as $item) {
echo $item.\n;
}
echo \n;
}
// Cleanup
$stmtarray = array(
drop table bug37220_tab
);
foreach ($stmtarray as $stmt) {
$s = oci_parse($c, $stmt);
oci_execute($s);
}
echo Done\n;
?
--EXPECT--
MYTAG/
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
