[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/Zend/ zend_vm_def.h zend_vm_execute.h
pajoye Sat, 10 Oct 2009 09:12:58 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289493
Log:
- Merge: Fixed memleak in tests/lang/engine_assignExecutionOrder_001.phpt
Changed paths:
U php/php-src/branches/PHP_5_3_1/Zend/zend_vm_def.h
U php/php-src/branches/PHP_5_3_1/Zend/zend_vm_execute.h
Modified: php/php-src/branches/PHP_5_3_1/Zend/zend_vm_def.h
===
--- php/php-src/branches/PHP_5_3_1/Zend/zend_vm_def.h 2009-10-10 08:56:28 UTC
(rev 289492)
+++ php/php-src/branches/PHP_5_3_1/Zend/zend_vm_def.h 2009-10-10 09:12:58 UTC
(rev 289493)
@@ -940,6 +940,7 @@
if (opline-op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) {
retval =
zend_std_get_static_property(EX_T(opline-op2.u.var).class_entry,
Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC);
+ FREE_OP1();
} else {
target_symbol_table = zend_get_target_symbol_table(opline,
EX(Ts), type, varname TSRMLS_CC);
/*
Modified: php/php-src/branches/PHP_5_3_1/Zend/zend_vm_execute.h
===
--- php/php-src/branches/PHP_5_3_1/Zend/zend_vm_execute.h 2009-10-10
08:56:28 UTC (rev 289492)
+++ php/php-src/branches/PHP_5_3_1/Zend/zend_vm_execute.h 2009-10-10
09:12:58 UTC (rev 289493)
@@ -4607,6 +4607,7 @@
if (opline-op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) {
retval =
zend_std_get_static_property(EX_T(opline-op2.u.var).class_entry,
Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC);
+ zval_dtor(free_op1.var);
} else {
target_symbol_table = zend_get_target_symbol_table(opline,
EX(Ts), type, varname TSRMLS_CC);
/*
@@ -7848,6 +7849,7 @@
if (opline-op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) {
retval =
zend_std_get_static_property(EX_T(opline-op2.u.var).class_entry,
Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC);
+ if (free_op1.var) {zval_ptr_dtor(free_op1.var);};
} else {
target_symbol_table = zend_get_target_symbol_table(opline,
EX(Ts), type, varname TSRMLS_CC);
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ext/curl/ interface.c
pajoye Sat, 10 Oct 2009 09:17:01 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289494
Log:
- Merge: Fixed bug #49531 (CURLOPT_INFILESIZE sometimes causes warning
?\226?\128?\156CURLPROTO_FILE cannot be set ?\226?\128?\166)
Bug: http://bugs.php.net/49531 (Closed) CURLOPT_INFILESIZE sometimes causes
warning CURLPROTO_FILE cannot be set
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/curl/interface.c
Modified: php/php-src/branches/PHP_5_3_1/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_3_1/ext/curl/interface.c 2009-10-10 09:12:58 UTC
(rev 289493)
+++ php/php-src/branches/PHP_5_3_1/ext/curl/interface.c 2009-10-10 09:17:01 UTC
(rev 289494)
@@ -1563,7 +1563,8 @@
#endif
convert_to_long_ex(zvalue);
#if LIBCURL_VERSION_NUM = 0x71304
- if (((PG(open_basedir) *PG(open_basedir)) ||
PG(safe_mode)) (Z_LVAL_PP(zvalue) CURLPROTO_FILE)) {
+ if ((option == CURLOPT_PROTOCOLS || option ==
CURLOPT_REDIR_PROTOCOLS)
+ ((PG(open_basedir) *PG(open_basedir)) ||
PG(safe_mode)) (Z_LVAL_PP(zvalue) CURLPROTO_FILE)) {
php_error_docref(NULL TSRMLS_CC,
E_WARNING, CURLPROTO_FILE cannot be activated when in safe_mode or an
open_basedir is set);
RETVAL_FALSE;
return 1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ext/curl/ interface.c
pajoye Sat, 10 Oct 2009 09:24:59 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289495
Log:
- Merge: Fixed bug #49517 (cURL's CURLOPT_FILE prevents file from being deleted
after fclose)
Bug: http://bugs.php.net/49517 (Closed) cURL's CURLOPT_FILE prevents file from
being deleted after fclose
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/curl/interface.c
Modified: php/php-src/branches/PHP_5_3_1/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_3_1/ext/curl/interface.c 2009-10-10 09:17:01 UTC
(rev 289494)
+++ php/php-src/branches/PHP_5_3_1/ext/curl/interface.c 2009-10-10 09:24:59 UTC
(rev 289495)
@@ -1424,10 +1424,22 @@
dupch-cp = cp;
dupch-uses = 0;
+ if (ch-handlers-write-stream) {
+ Z_ADDREF_P(dupch-handlers-write-stream);
+ dupch-handlers-write-stream = ch-handlers-write-stream;
+ }
dupch-handlers-write-method = ch-handlers-write-method;
dupch-handlers-write-type = ch-handlers-write-type;
+ if (ch-handlers-read-stream) {
+ Z_ADDREF_P(ch-handlers-read-stream);
+ }
+ dupch-handlers-read-stream = ch-handlers-read-stream;
dupch-handlers-read-method = ch-handlers-read-method;
dupch-handlers-write_header-method =
ch-handlers-write_header-method;
+ if (ch-handlers-write_header-stream) {
+ Z_ADDREF_P(ch-handlers-write_header-stream);
+ }
+ dupch-handlers-write_header-stream =
ch-handlers-write_header-stream;
dupch-handlers-write-fp = ch-handlers-write-fp;
dupch-handlers-write_header-fp = ch-handlers-write_header-fp;
@@ -1673,9 +1685,10 @@
switch (option) {
case CURLOPT_FILE:
if (((php_stream *) what)-mode[0] !=
'r' || ((php_stream *) what)-mode[1] == '+') {
-
zend_list_addref(Z_LVAL_PP(zvalue));
+ Z_ADDREF_PP(zvalue);
ch-handlers-write-fp = fp;
ch-handlers-write-method =
PHP_CURL_FILE;
+ ch-handlers-write-stream =
*zvalue;
} else {
php_error_docref(NULL
TSRMLS_CC, E_WARNING, the provided file handle is not writable);
RETVAL_FALSE;
@@ -1684,9 +1697,10 @@
break;
case CURLOPT_WRITEHEADER:
if (((php_stream *) what)-mode[0] !=
'r' || ((php_stream *) what)-mode[1] == '+') {
-
zend_list_addref(Z_LVAL_PP(zvalue));
+ Z_ADDREF_PP(zvalue);
ch-handlers-write_header-fp
= fp;
ch-handlers-write_header-method = PHP_CURL_FILE;
+
ch-handlers-write_header-stream = *zvalue;
} else {
php_error_docref(NULL
TSRMLS_CC, E_WARNING, the provided file handle is not writable);
RETVAL_FALSE;
@@ -1694,9 +1708,10 @@
}
break;
case CURLOPT_INFILE:
- zend_list_addref(Z_LVAL_PP(zvalue));
+ Z_ADDREF_PP(zvalue);
ch-handlers-read-fp = fp;
ch-handlers-read-fd =
Z_LVAL_PP(zvalue);
+ ch-handlers-read-stream = *zvalue;
break;
case CURLOPT_STDERR:
if (((php_stream *) what)-mode[0] !=
'r' || ((php_stream *) what)-mode[1] == '+') {
@@ -2357,6 +2372,16 @@
efree(ch-header.str);
}
+ if (ch-handlers-write_header-stream) {
+ zval_ptr_dtor(ch-handlers-write_header-stream);
+ }
+ if (ch-handlers-write-stream) {
+ zval_ptr_dtor(ch-handlers-write-stream);
+ }
+ if (ch-handlers-read-stream) {
+ zval_ptr_dtor(ch-handlers-read-stream);
+ }
+
efree(ch-handlers-write);
efree(ch-handlers-write_header);
efree(ch-handlers-read);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ext/curl/ php_curl.h
pajoye Sat, 10 Oct 2009 09:29:34 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289496
Log:
- Merge: Fixed bug #49517 (cURL's CURLOPT_FILE prevents file from being deleted
after fclose)
Bug: http://bugs.php.net/49517 (Closed) cURL's CURLOPT_FILE prevents file from
being deleted after fclose
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/curl/php_curl.h
Modified: php/php-src/branches/PHP_5_3_1/ext/curl/php_curl.h
===
--- php/php-src/branches/PHP_5_3_1/ext/curl/php_curl.h 2009-10-10 09:24:59 UTC
(rev 289495)
+++ php/php-src/branches/PHP_5_3_1/ext/curl/php_curl.h 2009-10-10 09:29:34 UTC
(rev 289496)
@@ -86,6 +86,7 @@
smart_str buf;
int method;
int type;
+ zval*stream;
} php_curl_write;
typedef struct {
@@ -94,6 +95,7 @@
FILE*fp;
longfd;
int method;
+ zval*stream;
} php_curl_read;
typedef struct {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/main/ network.c
pajoye Sat, 10 Oct 2009 12:21:08 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=289498
Log:
- Merge: Fixed bug #48805 (IPv6 socket transport is not working)
Bug: http://bugs.php.net/48805 (Closed) IPv6 socket transport is not working
Changed paths:
U php/php-src/branches/PHP_5_3_1/main/network.c
Modified: php/php-src/branches/PHP_5_3_1/main/network.c
===
--- php/php-src/branches/PHP_5_3_1/main/network.c 2009-10-10 09:49:29 UTC
(rev 289497)
+++ php/php-src/branches/PHP_5_3_1/main/network.c 2009-10-10 12:21:08 UTC
(rev 289498)
@@ -792,7 +792,7 @@
switch (sa-sa_family) {
#if HAVE_GETADDRINFO HAVE_IPV6
case AF_INET6:
- if (bindto strchr(bindto, ':')) {
+ if (!bindto || strchr(bindto, ':')) {
((struct sockaddr_in6
*)sa)-sin6_family = sa-sa_family;
((struct sockaddr_in6 *)sa)-sin6_port
= htons(port);
socklen = sizeof(struct sockaddr_in6);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
