[PHP-CVS] cvs: php-src /ext/tokenizer config.w32
stasThu Aug 2 00:04:05 2007 UTC
Modified files:
/php-src/ext/tokenizer config.w32
Log:
fix win32 build
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/config.w32?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/tokenizer/config.w32
diff -u php-src/ext/tokenizer/config.w32:1.1
php-src/ext/tokenizer/config.w32:1.2
--- php-src/ext/tokenizer/config.w32:1.1Tue Dec 2 23:16:59 2003
+++ php-src/ext/tokenizer/config.w32Thu Aug 2 00:04:05 2007
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.1 2003/12/02 23:16:59 wez Exp $
+// $Id: config.w32,v 1.2 2007/08/02 00:04:05 stas Exp $
// vim:ft=javascript
ARG_ENABLE("tokenizer", "tokenizer support", "yes");
if (PHP_TOKENIZER == "yes") {
- EXTENSION("tokenizer", "tokenizer.c");
+ EXTENSION("tokenizer", "tokenizer.c tokenizer_data.c");
AC_DEFINE("HAVE_TOKENIZER", 1, "Tokenizer support");
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
stasWed Aug 1 23:54:06 2007 UTC
Modified files:
/php-src/main main.c
Log:
revert wrong fix
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.742&r2=1.743&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.742 php-src/main/main.c:1.743
--- php-src/main/main.c:1.742 Wed Aug 1 12:49:23 2007
+++ php-src/main/main.c Wed Aug 1 23:54:06 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.742 2007/08/01 12:49:23 johannes Exp $ */
+/* $Id: main.c,v 1.743 2007/08/01 23:54:06 stas Exp $ */
/* {{{ includes
*/
@@ -542,9 +542,6 @@
return;
}
#endif
- if (PG(open_basedir) &&
php_check_open_basedir_ex(PG(error_log), 0 TSRMLS_CC)) {
- return;
- }
fd = VCWD_OPEN_MODE(PG(error_log), O_CREAT | O_APPEND |
O_WRONLY, 0644);
if (fd != -1) {
char *tmp;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /main main.c
stasWed Aug 1 23:52:43 2007 UTC
Modified files: (Branch: PHP_4_4)
/php-src/main main.c
Log:
revert wrong fix
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.512.2.63.2.16&r2=1.512.2.63.2.17&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.63.2.16 php-src/main/main.c:1.512.2.63.2.17
--- php-src/main/main.c:1.512.2.63.2.16 Tue Jul 10 18:35:13 2007
+++ php-src/main/main.c Wed Aug 1 23:52:43 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.512.2.63.2.16 2007/07/10 18:35:13 stas Exp $ */
+/* $Id: main.c,v 1.512.2.63.2.17 2007/08/01 23:52:43 stas Exp $ */
/* {{{ includes
*/
@@ -384,14 +384,6 @@
return;
}
#endif
- if (PG(safe_mode) && (!php_checkuid(PG(error_log), NULL,
CHECKUID_CHECK_FILE_AND_DIR|CHECKUID_NO_ERRORS))) {
- return FAILURE;
- }
-
- if (PG(open_basedir) &&
php_check_open_basedir_ex(PG(error_log), 0 TSRMLS_CC)) {
- return FAILURE;
- }
-
log_file = VCWD_FOPEN(PG(error_log), "ab");
if (log_file != NULL) {
time(&error_time);
--
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) /main main.c
stasWed Aug 1 23:51:45 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main main.c
Log:
revert wrong fix
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.50&r2=1.640.2.23.2.51&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.50 php-src/main/main.c:1.640.2.23.2.51
--- php-src/main/main.c:1.640.2.23.2.50 Wed Aug 1 12:49:34 2007
+++ php-src/main/main.c Wed Aug 1 23:51:45 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.23.2.50 2007/08/01 12:49:34 johannes Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.51 2007/08/01 23:51:45 stas Exp $ */
/* {{{ includes
*/
@@ -442,14 +442,6 @@
return;
}
#endif
- if (PG(safe_mode) && (!php_checkuid(PG(error_log), NULL,
CHECKUID_CHECK_FILE_AND_DIR|CHECKUID_NO_ERRORS))) {
- return;
- }
-
- if (PG(open_basedir) &&
php_check_open_basedir_ex(PG(error_log), 0 TSRMLS_CC)) {
- return;
- }
-
fd = VCWD_OPEN_MODE(PG(error_log), O_CREAT | O_APPEND |
O_WRONLY, 0644);
if (fd != -1) {
char *tmp;
--
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_sqlite sqlite_statement.c
iliaa Wed Aug 1 22:45:32 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo_sqlite sqlite_statement.c
/php-srcNEWS
Log:
Fixed bug #41831 (pdo_sqlite prepared statements convert resources to
strings).
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.18.2.4.2.2&r2=1.18.2.4.2.3&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.2
php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.2 Mon Jan 1
09:36:05 2007
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Wed Aug 1 22:45:31 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite_statement.c,v 1.18.2.4.2.2 2007/01/01 09:36:05 sebastian Exp $
*/
+/* $Id: sqlite_statement.c,v 1.18.2.4.2.3 2007/08/01 22:45:31 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -109,7 +109,7 @@
php_stream *stm;
php_stream_from_zval_no_verify(stm, ¶m->parameter);
if (stm) {
-
SEPARATE_ZVAL_IF_NOT_REF(¶m->parameter);
+
SEPARATE_ZVAL(¶m->parameter);
Z_TYPE_P(param->parameter) = IS_STRING;
Z_STRLEN_P(param->parameter) = php_stream_copy_to_mem(stm,
&Z_STRVAL_P(param->parameter), PHP_STREAM_COPY_ALL, 0);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.871&r2=1.2027.2.547.2.872&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.871 php-src/NEWS:1.2027.2.547.2.872
--- php-src/NEWS:1.2027.2.547.2.871 Wed Aug 1 10:56:45 2007
+++ php-src/NEWSWed Aug 1 22:45:31 2007
@@ -122,6 +122,8 @@
date_create or new DateTime). (Derick)
- Fixed bug #41833 (addChild() on a non-existent node, no node created,
getName() segfaults). (Rob)
+- Fixed bug #41831 (pdo_sqlite prepared statements convert resources to
+ strings). (Ilia)
- Fixed bug #41815 (Concurrent read/write fails when EOF is reached). (Sascha)
- Fixed bug #41813 (segmentation fault when using string offset as an object).
(judas dot iscariote at gmail dot com, 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_2) /ext/oci8/tests parse_error.phpt
sixdWed Aug 1 15:18:37 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/oci8/tests parse_error.phpt
Log:
MFH: New test for error handling
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/parse_error.phpt?view=markup&rev=1.1
Index: php-src/ext/oci8/tests/parse_error.phpt
+++ php-src/ext/oci8/tests/parse_error.phpt
--TEST--
Test error handling when persistent connection is passed to oci_error()
--SKIPIF--
--FILE--
--EXPECTF--
Normal connection: Parse error
array(4) {
["code"]=>
int(1756)
["message"]=>
string(48) "ORA-01756: quoted string not properly terminated"
["offset"]=>
int(0)
["sqltext"]=>
string(0) ""
}
New connection: Parse error
array(4) {
["code"]=>
int(1756)
["message"]=>
string(48) "ORA-01756: quoted string not properly terminated"
["offset"]=>
int(0)
["sqltext"]=>
string(0) ""
}
Persistent connection: Parse error
array(4) {
["code"]=>
int(1756)
["message"]=>
string(48) "ORA-01756: quoted string not properly terminated"
["offset"]=>
int(0)
["sqltext"]=>
string(0) ""
}
No connection: error: bool(false)
Normal connection (take #2): Parse error: ORA-01756: quoted string not properly
terminated
New connection (take #2): Parse error: ORA-01756: quoted string not properly
terminated
Persistent connection (take #2): Parse error: ORA-01756: quoted string not
properly terminated
Normal connection: New Collection error: OCI-22303: type ""."ABC" not found
New connection (take #3): Parse error: ORA-01756: quoted string not properly
terminated
Persistent connection (take #3): Parse error: ORA-01756: quoted string not
properly terminated
Done
--UEXPECTF--
Normal connection: Parse error
array(4) {
[u"code"]=>
int(1756)
[u"message"]=>
unicode(48) "ORA-01756: quoted string not properly terminated"
[u"offset"]=>
int(0)
[u"sqltext"]=>
unicode(0) ""
}
New connection: Parse error
array(4) {
[u"code"]=>
int(1756)
[u"message"]=>
unicode(48) "ORA-01756: quoted string not properly terminated"
[u"offset"]=>
int(0)
[u"sqltext"]=>
unicode(0) ""
}
Persistent connection: Parse error
array(4) {
[u"code"]=>
int(1756)
[u"message"]=>
unicode(48) "ORA-01756: quoted string not properly terminated"
[u"offset"]=>
int(0)
[u"sqltext"]=>
unicode(0) ""
}
No connection: error: bool(false)
Normal connection (take #2): Parse error: ORA-01756: quoted string not properly
terminated
New connection (take #2): Parse error: ORA-01756: quoted string not properly
terminated
Persistent connection (take #2): Parse error: ORA-01756: quoted string not
properly terminated
Normal connection: New Collection error: OCI-22303: type ""."ABC" not found
New connection (take #3): Parse error: ORA-01756: quoted string not properly
terminated
Persistent connection (take #3): Parse error: ORA-01756: quoted string not
properly terminated
Done
--
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 parse_error.phpt
sixdWed Aug 1 15:18:25 2007 UTC
Added files:
/php-src/ext/oci8/tests parse_error.phpt
Log:
New test for error handling
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/parse_error.phpt?view=markup&rev=1.1
Index: php-src/ext/oci8/tests/parse_error.phpt
+++ php-src/ext/oci8/tests/parse_error.phpt
--TEST--
Test error handling when persistent connection is passed to oci_error()
--SKIPIF--
--FILE--
--EXPECTF--
Normal connection: Parse error
array(4) {
["code"]=>
int(1756)
["message"]=>
string(48) "ORA-01756: quoted string not properly terminated"
["offset"]=>
int(0)
["sqltext"]=>
string(0) ""
}
New connection: Parse error
array(4) {
["code"]=>
int(1756)
["message"]=>
string(48) "ORA-01756: quoted string not properly terminated"
["offset"]=>
int(0)
["sqltext"]=>
string(0) ""
}
Persistent connection: Parse error
array(4) {
["code"]=>
int(1756)
["message"]=>
string(48) "ORA-01756: quoted string not properly terminated"
["offset"]=>
int(0)
["sqltext"]=>
string(0) ""
}
No connection: error: bool(false)
Normal connection (take #2): Parse error: ORA-01756: quoted string not properly
terminated
New connection (take #2): Parse error: ORA-01756: quoted string not properly
terminated
Persistent connection (take #2): Parse error: ORA-01756: quoted string not
properly terminated
Normal connection: New Collection error: OCI-22303: type ""."ABC" not found
New connection (take #3): Parse error: ORA-01756: quoted string not properly
terminated
Persistent connection (take #3): Parse error: ORA-01756: quoted string not
properly terminated
Done
--UEXPECTF--
Normal connection: Parse error
array(4) {
[u"code"]=>
int(1756)
[u"message"]=>
unicode(48) "ORA-01756: quoted string not properly terminated"
[u"offset"]=>
int(0)
[u"sqltext"]=>
unicode(0) ""
}
New connection: Parse error
array(4) {
[u"code"]=>
int(1756)
[u"message"]=>
unicode(48) "ORA-01756: quoted string not properly terminated"
[u"offset"]=>
int(0)
[u"sqltext"]=>
unicode(0) ""
}
Persistent connection: Parse error
array(4) {
[u"code"]=>
int(1756)
[u"message"]=>
unicode(48) "ORA-01756: quoted string not properly terminated"
[u"offset"]=>
int(0)
[u"sqltext"]=>
unicode(0) ""
}
No connection: error: bool(false)
Normal connection (take #2): Parse error: ORA-01756: quoted string not properly
terminated
New connection (take #2): Parse error: ORA-01756: quoted string not properly
terminated
Persistent connection (take #2): Parse error: ORA-01756: quoted string not
properly terminated
Normal connection: New Collection error: OCI-22303: type ""."ABC" not found
New connection (take #3): Parse error: ORA-01756: quoted string not properly
terminated
Persistent connection (take #3): Parse error: ORA-01756: quoted string not
properly terminated
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/tokenizer config.w32
pajoye Wed Aug 1 15:13:40 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/tokenizer config.w32
Log:
- fix win32 build
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/config.w32?r1=1.1&r2=1.1.6.1&diff_format=u
Index: php-src/ext/tokenizer/config.w32
diff -u php-src/ext/tokenizer/config.w32:1.1
php-src/ext/tokenizer/config.w32:1.1.6.1
--- php-src/ext/tokenizer/config.w32:1.1Tue Dec 2 23:16:59 2003
+++ php-src/ext/tokenizer/config.w32Wed Aug 1 15:13:40 2007
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.1 2003/12/02 23:16:59 wez Exp $
+// $Id: config.w32,v 1.1.6.1 2007/08/01 15:13:40 pajoye Exp $
// vim:ft=javascript
ARG_ENABLE("tokenizer", "tokenizer support", "yes");
if (PHP_TOKENIZER == "yes") {
- EXTENSION("tokenizer", "tokenizer.c");
+ EXTENSION("tokenizer", "tokenizer.c tokenizer_data.c");
AC_DEFINE("HAVE_TOKENIZER", 1, "Tokenizer support");
}
--
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) /main main.c
johannesWed Aug 1 12:49:34 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main main.c
Log:
- MFH: Fix #42164 Internal Sendmail Support is ALWAYS disabled
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.49&r2=1.640.2.23.2.50&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.49 php-src/main/main.c:1.640.2.23.2.50
--- php-src/main/main.c:1.640.2.23.2.49 Tue Jul 24 20:32:32 2007
+++ php-src/main/main.c Wed Aug 1 12:49:34 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.23.2.49 2007/07/24 20:32:32 tony2001 Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.50 2007/08/01 12:49:34 johannes Exp $ */
/* {{{ includes
*/
@@ -314,6 +314,8 @@
#if defined(PHP_PROG_SENDMAIL) && !defined(NETWARE)
# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i "
+#elif defined(PHP_WIN32)
+# define DEFAULT_SENDMAIL_PATH NULL
#else
# define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i"
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
johannesWed Aug 1 12:49:23 2007 UTC
Modified files:
/php-src/main main.c
Log:
- Fix #42164 Internal Sendmail Support is ALWAYS disabled
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.741&r2=1.742&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.741 php-src/main/main.c:1.742
--- php-src/main/main.c:1.741 Tue Jul 24 20:14:03 2007
+++ php-src/main/main.c Wed Aug 1 12:49:23 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.741 2007/07/24 20:14:03 tony2001 Exp $ */
+/* $Id: main.c,v 1.742 2007/08/01 12:49:23 johannes Exp $ */
/* {{{ includes
*/
@@ -427,6 +427,8 @@
#if defined(PHP_PROG_SENDMAIL) && !defined(NETWARE)
# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i "
+#elif defined(PHP_WIN32)
+# define DEFAULT_SENDMAIL_PATH NULL
#else
# define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i"
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/libxml libxml.c php_libxml.h
tony2001Wed Aug 1 11:43:27 2007 UTC
Modified files:
/php-src/ext/libxml libxml.c php_libxml.h
Log:
an attempt to fix win32 build
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.62&r2=1.63&diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.62 php-src/ext/libxml/libxml.c:1.63
--- php-src/ext/libxml/libxml.c:1.62Sat Jul 28 08:34:09 2007
+++ php-src/ext/libxml/libxml.c Wed Aug 1 11:43:27 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.62 2007/07/28 08:34:09 rrichards Exp $ */
+/* $Id: libxml.c,v 1.63 2007/08/01 11:43:27 tony2001 Exp $ */
#define IS_EXT_MODULE
@@ -897,7 +897,7 @@
}
-int php_libxml_increment_node_ptr(php_libxml_node_object *object, xmlNodePtr
node, void *private_data TSRMLS_DC)
+PHP_LIBXML_API int php_libxml_increment_node_ptr(php_libxml_node_object
*object, xmlNodePtr node, void *private_data TSRMLS_DC)
{
int ret_refcount = -1;
@@ -929,7 +929,7 @@
return ret_refcount;
}
-int php_libxml_decrement_node_ptr(php_libxml_node_object *object TSRMLS_DC)
+PHP_LIBXML_API int php_libxml_decrement_node_ptr(php_libxml_node_object
*object TSRMLS_DC)
{
int ret_refcount = -1;
php_libxml_node_ptr *obj_node;
@@ -949,7 +949,7 @@
return ret_refcount;
}
-int php_libxml_increment_doc_ref(php_libxml_node_object *object, xmlDocPtr
docp TSRMLS_DC)
+PHP_LIBXML_API int php_libxml_increment_doc_ref(php_libxml_node_object
*object, xmlDocPtr docp TSRMLS_DC)
{
int ret_refcount = -1;
@@ -969,7 +969,7 @@
return ret_refcount;
}
-int php_libxml_decrement_doc_ref(php_libxml_node_object *object TSRMLS_DC)
+PHP_LIBXML_API int php_libxml_decrement_doc_ref(php_libxml_node_object *object
TSRMLS_DC)
{
int ret_refcount = -1;
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/php_libxml.h?r1=1.26&r2=1.27&diff_format=u
Index: php-src/ext/libxml/php_libxml.h
diff -u php-src/ext/libxml/php_libxml.h:1.26
php-src/ext/libxml/php_libxml.h:1.27
--- php-src/ext/libxml/php_libxml.h:1.26Sat Jul 21 00:49:53 2007
+++ php-src/ext/libxml/php_libxml.h Wed Aug 1 11:43:27 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_libxml.h,v 1.26 2007/07/21 00:49:53 jani Exp $ */
+/* $Id: php_libxml.h,v 1.27 2007/08/01 11:43:27 tony2001 Exp $ */
#ifndef PHP_LIBXML_H
#define PHP_LIBXML_H
@@ -77,8 +77,8 @@
typedef void * (*php_libxml_export_node) (zval *object TSRMLS_DC);
-int php_libxml_increment_node_ptr(php_libxml_node_object *object, xmlNodePtr
node, void *private_data TSRMLS_DC);
-int php_libxml_decrement_node_ptr(php_libxml_node_object *object TSRMLS_DC);
+PHP_LIBXML_API int php_libxml_increment_node_ptr(php_libxml_node_object
*object, xmlNodePtr node, void *private_data TSRMLS_DC);
+PHP_LIBXML_API int php_libxml_decrement_node_ptr(php_libxml_node_object
*object TSRMLS_DC);
PHP_LIBXML_API int php_libxml_increment_doc_ref(php_libxml_node_object
*object, xmlDocPtr docp TSRMLS_DC);
PHP_LIBXML_API int php_libxml_decrement_doc_ref(php_libxml_node_object *object
TSRMLS_DC);
PHP_LIBXML_API xmlNodePtr php_libxml_import_node(zval *object TSRMLS_DC);
--
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/libxml libxml.c php_libxml.h
tony2001Wed Aug 1 11:43:05 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/libxml libxml.c php_libxml.h
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.14&r2=1.32.2.7.2.15&diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.14
php-src/ext/libxml/libxml.c:1.32.2.7.2.15
--- php-src/ext/libxml/libxml.c:1.32.2.7.2.14 Sat Jul 28 08:32:49 2007
+++ php-src/ext/libxml/libxml.c Wed Aug 1 11:43:05 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.32.2.7.2.14 2007/07/28 08:32:49 rrichards Exp $ */
+/* $Id: libxml.c,v 1.32.2.7.2.15 2007/08/01 11:43:05 tony2001 Exp $ */
#define IS_EXT_MODULE
@@ -894,7 +894,7 @@
return node;
}
-int php_libxml_increment_node_ptr(php_libxml_node_object *object, xmlNodePtr
node, void *private_data TSRMLS_DC)
+PHP_LIBXML_API int php_libxml_increment_node_ptr(php_libxml_node_object
*object, xmlNodePtr node, void *private_data TSRMLS_DC)
{
int ret_refcount = -1;
@@ -926,7 +926,7 @@
return ret_refcount;
}
-int php_libxml_decrement_node_ptr(php_libxml_node_object *object TSRMLS_DC)
+PHP_LIBXML_API int php_libxml_decrement_node_ptr(php_libxml_node_object
*object TSRMLS_DC)
{
int ret_refcount = -1;
php_libxml_node_ptr *obj_node;
@@ -946,7 +946,7 @@
return ret_refcount;
}
-int php_libxml_increment_doc_ref(php_libxml_node_object *object, xmlDocPtr
docp TSRMLS_DC)
+PHP_LIBXML_API int php_libxml_increment_doc_ref(php_libxml_node_object
*object, xmlDocPtr docp TSRMLS_DC)
{
int ret_refcount = -1;
@@ -964,7 +964,7 @@
return ret_refcount;
}
-int php_libxml_decrement_doc_ref(php_libxml_node_object *object TSRMLS_DC)
+PHP_LIBXML_API int php_libxml_decrement_doc_ref(php_libxml_node_object *object
TSRMLS_DC)
{
int ret_refcount = -1;
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/php_libxml.h?r1=1.15.2.2.2.5&r2=1.15.2.2.2.6&diff_format=u
Index: php-src/ext/libxml/php_libxml.h
diff -u php-src/ext/libxml/php_libxml.h:1.15.2.2.2.5
php-src/ext/libxml/php_libxml.h:1.15.2.2.2.6
--- php-src/ext/libxml/php_libxml.h:1.15.2.2.2.5Sat Jul 21 00:51:17 2007
+++ php-src/ext/libxml/php_libxml.h Wed Aug 1 11:43:05 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_libxml.h,v 1.15.2.2.2.5 2007/07/21 00:51:17 jani Exp $ */
+/* $Id: php_libxml.h,v 1.15.2.2.2.6 2007/08/01 11:43:05 tony2001 Exp $ */
#ifndef PHP_LIBXML_H
#define PHP_LIBXML_H
@@ -75,8 +75,8 @@
typedef void * (*php_libxml_export_node) (zval *object TSRMLS_DC);
-int php_libxml_increment_node_ptr(php_libxml_node_object *object, xmlNodePtr
node, void *private_data TSRMLS_DC);
-int php_libxml_decrement_node_ptr(php_libxml_node_object *object TSRMLS_DC);
+PHP_LIBXML_API int php_libxml_increment_node_ptr(php_libxml_node_object
*object, xmlNodePtr node, void *private_data TSRMLS_DC);
+PHP_LIBXML_API int php_libxml_decrement_node_ptr(php_libxml_node_object
*object TSRMLS_DC);
PHP_LIBXML_API int php_libxml_increment_doc_ref(php_libxml_node_object
*object, xmlDocPtr docp TSRMLS_DC);
PHP_LIBXML_API int php_libxml_decrement_doc_ref(php_libxml_node_object *object
TSRMLS_DC);
PHP_LIBXML_API xmlNodePtr php_libxml_import_node(zval *object TSRMLS_DC);
--
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 /ext/soap/tests/bugs bug42151.phpt
dmitry Wed Aug 1 10:39:49 2007 UTC
Modified files:
/php-src/ext/soap soap.c
/php-src/ext/soap/tests/bugsbug42151.phpt
Log:
Fixed bug #42151 (__destruct functions not called after catching a SoapFault
exception)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.225&r2=1.226&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.225 php-src/ext/soap/soap.c:1.226
--- php-src/ext/soap/soap.c:1.225 Fri Jul 13 14:01:11 2007
+++ php-src/ext/soap/soap.c Wed Aug 1 10:39:49 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: soap.c,v 1.225 2007/07/13 14:01:11 dmitry Exp $ */
+/* $Id: soap.c,v 1.226 2007/08/01 10:39:49 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2377,6 +2377,7 @@
#ifdef va_copy
va_list argcopy;
#endif
+ zend_object_store_bucket *old_objects;
int old = PG(display_errors);
INIT_ZVAL(outbuf);
@@ -2400,6 +2401,8 @@
INIT_PZVAL(exception);
zend_throw_exception_object(exception TSRMLS_CC);
+ old_objects = EG(objects_store).object_buckets;
+ EG(objects_store).object_buckets = NULL;
PG(display_errors) = 0;
zend_try {
call_old_error_handler(error_num,
error_filename, error_lineno, format, args);
@@ -2408,6 +2411,7 @@
EG(in_execution) = _old_in_execution;
EG(current_execute_data) =
_old_current_execute_data;
} zend_end_try();
+ EG(objects_store).object_buckets = old_objects;
PG(display_errors) = old;
zend_bailout();
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42151.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/soap/tests/bugs/bug42151.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/bug42151.phpt:1.2
--- /dev/null Wed Aug 1 10:39:49 2007
+++ php-src/ext/soap/tests/bugs/bug42151.phpt Wed Aug 1 10:39:49 2007
@@ -0,0 +1,31 @@
+--TEST--
+Bug #42151 __destruct functions not called after catching a SoapFault exception
+--SKIPIF--
+
+--FILE--
+getMessage() . "\n";
+}
+echo "ok\n";
+?>
+--EXPECT--
+SOAP-ERROR: Parsing WSDL: Couldn't load from 'httpx://'
+ok
+I don't get executed either.
--
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/soap soap.c /ext/soap/tests/bugs bug42151.phpt
dmitry Wed Aug 1 10:39:33 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug42151.phpt
Modified files:
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #42151 (__destruct functions not called after catching a SoapFault
exception)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.869&r2=1.2027.2.547.2.870&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.869 php-src/NEWS:1.2027.2.547.2.870
--- php-src/NEWS:1.2027.2.547.2.869 Tue Jul 31 22:48:42 2007
+++ php-src/NEWSWed Aug 1 10:39:32 2007
@@ -70,6 +70,8 @@
- Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory
already exists). (Pierre)
+- Fixed bug #42151 (__destruct functions not called after catching a SoapFault
+ exception). (Dmitry)
- Fixed bug #42142 (substr_replace() returns FALSE when length > string
length). (Ilia)
- Fixed bug #42135 (Second call of session_start() causes creation of SID).
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.26&r2=1.156.2.28.2.27&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.26
php-src/ext/soap/soap.c:1.156.2.28.2.27
--- php-src/ext/soap/soap.c:1.156.2.28.2.26 Fri Jul 13 14:00:05 2007
+++ php-src/ext/soap/soap.c Wed Aug 1 10:39:33 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.26 2007/07/13 14:00:05 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.27 2007/08/01 10:39:33 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2067,6 +2067,7 @@
#ifdef va_copy
va_list argcopy;
#endif
+ zend_object_store_bucket *old_objects;
int old = PG(display_errors);
INIT_ZVAL(outbuf);
@@ -2093,6 +2094,8 @@
INIT_PZVAL(exception);
zend_throw_exception_object(exception TSRMLS_CC);
+ old_objects = EG(objects_store).object_buckets;
+ EG(objects_store).object_buckets = NULL;
PG(display_errors) = 0;
zend_try {
call_old_error_handler(error_num,
error_filename, error_lineno, format, args);
@@ -2101,6 +2104,7 @@
EG(in_execution) = _old_in_execution;
EG(current_execute_data) =
_old_current_execute_data;
} zend_end_try();
+ EG(objects_store).object_buckets = old_objects;
PG(display_errors) = old;
zend_bailout();
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42151.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug42151.phpt
+++ php-src/ext/soap/tests/bugs/bug42151.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
