date:20120218

[PHP-CVS] svn: /php/php-src/trunk/sapi/cli/tests/ php_cli_server_004.phpt php_cli_server_005.phpt php_cli_server_006.phpt php_cli_server_007.phpt php_cli_server_008.phpt php_cli_server_009.phpt php_cl

2012-02-18 Thread Nikita Popov

nikicSat, 18 Feb 2012 11:59:13 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=323324

Log:
Fix cli server tests broken by r323078

Needs to be merged to 5.4 after r323078 is merged.

Changed paths:
U   php/php-src/trunk/sapi/cli/tests/php_cli_server_004.phpt
U   php/php-src/trunk/sapi/cli/tests/php_cli_server_005.phpt
U   php/php-src/trunk/sapi/cli/tests/php_cli_server_006.phpt
U   php/php-src/trunk/sapi/cli/tests/php_cli_server_007.phpt
U   php/php-src/trunk/sapi/cli/tests/php_cli_server_008.phpt
U   php/php-src/trunk/sapi/cli/tests/php_cli_server_009.phpt
U   php/php-src/trunk/sapi/cli/tests/php_cli_server_010.phpt
U   php/php-src/trunk/sapi/cli/tests/php_cli_server_012.phpt
U   php/php-src/trunk/sapi/cli/tests/php_cli_server_013.phpt
U   php/php-src/trunk/sapi/cli/tests/php_cli_server_014.phpt
U   php/php-src/trunk/sapi/cli/tests/php_cli_server_015.phpt

Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_004.phpt
===
--- php/php-src/trunk/sapi/cli/tests/php_cli_server_004.phpt2012-02-18 
11:27:34 UTC (rev 323323)
+++ php/php-src/trunk/sapi/cli/tests/php_cli_server_004.phpt2012-02-18 
11:59:13 UTC (rev 323324)
@@ -38,7 +38,7 @@
 --EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html


Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_005.phpt
===
--- php/php-src/trunk/sapi/cli/tests/php_cli_server_005.phpt2012-02-18 
11:27:34 UTC (rev 323323)
+++ php/php-src/trunk/sapi/cli/tests/php_cli_server_005.phpt2012-02-18 
11:59:13 UTC (rev 323324)
@@ -50,7 +50,7 @@
 --EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html


Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_006.phpt
===
--- php/php-src/trunk/sapi/cli/tests/php_cli_server_006.phpt2012-02-18 
11:27:34 UTC (rev 323323)
+++ php/php-src/trunk/sapi/cli/tests/php_cli_server_006.phpt2012-02-18 
11:59:13 UTC (rev 323324)
@@ -34,7 +34,7 @@
 --EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html


Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_007.phpt
===
--- php/php-src/trunk/sapi/cli/tests/php_cli_server_007.phpt2012-02-18 
11:27:34 UTC (rev 323323)
+++ php/php-src/trunk/sapi/cli/tests/php_cli_server_007.phpt2012-02-18 
11:59:13 UTC (rev 323324)
@@ -34,7 +34,7 @@
 --EXPECTF--
 HTTP/1.1 401 Unauthorized
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 WWW-Authenticate: Digest 
realm=foo,qop=auth,nonce=X,opaque=acbd18db4cc2f85cedef654fccc4a4d8
 Content-type: text/html

Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_008.phpt
===
--- php/php-src/trunk/sapi/cli/tests/php_cli_server_008.phpt2012-02-18 
11:27:34 UTC (rev 323323)
+++ php/php-src/trunk/sapi/cli/tests/php_cli_server_008.phpt2012-02-18 
11:59:13 UTC (rev 323324)
@@ -54,14 +54,14 @@
 --EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html

 string(8) HTTP/1.1
 HTTP/1.0 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html


Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_009.phpt
===
--- php/php-src/trunk/sapi/cli/tests/php_cli_server_009.phpt2012-02-18 
11:27:34 UTC (rev 323323)
+++ php/php-src/trunk/sapi/cli/tests/php_cli_server_009.phpt2012-02-18 
11:59:13 UTC (rev 323324)
@@ -78,14 +78,14 @@
 --EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html

 string(8) /foo/bar
 HTTP/1.0 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html


Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_010.phpt
===
--- php/php-src/trunk/sapi/cli/tests/php_cli_server_010.phpt2012-02-18 
11:27:34 UTC (rev 323323)
+++ php/php-src/trunk/sapi/cli/tests/php_cli_server_010.phpt2012-02-18 
11:59:13 UTC (rev 323324)
@@ -55,7 +55,7 @@
 --EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html

@@ -65,7 +65,7 @@
 string(7) foo=bar
 HTTP/1.0 200 OK
 Host: %s
-Connection: closed
+Connection: close
 X-Powered-By: PHP/%s
 Content-type: text/html


Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_012.phpt

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/phar/phar_object.c trunk/ext/phar/phar_object.c

2012-02-18 Thread Nikita Popov

nikicSat, 18 Feb 2012 13:39:13 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=323330

Log:
Fix headers generated by phar

sapi_header_line.line_len is the length without null terminator, so one has to
take sizeof - 1. This fixes some test failures as the NUL bytes were causing
warnings.

Needs to be merged to 5.4.

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
U   php/php-src/trunk/ext/phar/phar_object.c

Modified: php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
===
--- php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2012-02-18 13:14:30 UTC 
(rev 323329)
+++ php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2012-02-18 13:39:13 UTC 
(rev 323330)
@@ -427,7 +427,7 @@
sapi_header_line ctr = {0};

ctr.response_code = 403;
-   ctr.line_len = sizeof(HTTP/1.0 403 Access Denied);
+   ctr.line_len = sizeof(HTTP/1.0 403 Access Denied)-1;
ctr.line = HTTP/1.0 403 Access Denied;
sapi_header_op(SAPI_HEADER_REPLACE, ctr TSRMLS_CC);
sapi_send_headers(TSRMLS_C);
@@ -452,7 +452,7 @@
}

ctr.response_code = 404;
-   ctr.line_len = sizeof(HTTP/1.0 404 Not Found)+1;
+   ctr.line_len = sizeof(HTTP/1.0 404 Not Found)-1;
ctr.line = HTTP/1.0 404 Not Found;
sapi_header_op(SAPI_HEADER_REPLACE, ctr TSRMLS_CC);
sapi_send_headers(TSRMLS_C);
@@ -891,7 +891,7 @@
char *tmp = NULL, sa = '\0';
sapi_header_line ctr = {0};
ctr.response_code = 301;
-   ctr.line_len = sizeof(HTTP/1.1 301 Moved 
Permanently)+1;
+   ctr.line_len = sizeof(HTTP/1.1 301 Moved 
Permanently)-1;
ctr.line = HTTP/1.1 301 Moved Permanently;
sapi_header_op(SAPI_HEADER_REPLACE, ctr TSRMLS_CC);


Modified: php/php-src/trunk/ext/phar/phar_object.c
===
--- php/php-src/trunk/ext/phar/phar_object.c2012-02-18 13:14:30 UTC (rev 
323329)
+++ php/php-src/trunk/ext/phar/phar_object.c2012-02-18 13:39:13 UTC (rev 
323330)
@@ -428,7 +428,7 @@
sapi_header_line ctr = {0};

ctr.response_code = 403;
-   ctr.line_len = sizeof(HTTP/1.0 403 Access Denied);
+   ctr.line_len = sizeof(HTTP/1.0 403 Access Denied)-1;
ctr.line = HTTP/1.0 403 Access Denied;
sapi_header_op(SAPI_HEADER_REPLACE, ctr TSRMLS_CC);
sapi_send_headers(TSRMLS_C);
@@ -453,7 +453,7 @@
}

ctr.response_code = 404;
-   ctr.line_len = sizeof(HTTP/1.0 404 Not Found)+1;
+   ctr.line_len = sizeof(HTTP/1.0 404 Not Found)-1;
ctr.line = HTTP/1.0 404 Not Found;
sapi_header_op(SAPI_HEADER_REPLACE, ctr TSRMLS_CC);
sapi_send_headers(TSRMLS_C);
@@ -893,7 +893,7 @@
char *tmp = NULL, sa = '\0';
sapi_header_line ctr = {0};
ctr.response_code = 301;
-   ctr.line_len = sizeof(HTTP/1.1 301 Moved 
Permanently)+1;
+   ctr.line_len = sizeof(HTTP/1.1 301 Moved 
Permanently)-1;
ctr.line = HTTP/1.1 301 Moved Permanently;
sapi_header_op(SAPI_HEADER_REPLACE, ctr 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/NEWS branches/PHP_5_3/ext/xmlrpc/tests/bug61097.phpt branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c trunk/ext/xmlrpc/tests/bug61097.phpt trunk/ext/xmlrpc/xm

2012-02-18 Thread Nikita Popov

nikicSat, 18 Feb 2012 14:58:19 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=323331

Log:
Fix bug #61097 Memory leak in xmlrpc functions copying zvals

Needs to be merged to 5.4.

Bug: https://bugs.php.net/61097 (Assigned) Memory leak in xmlrpc functions 
copying zvals
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
A   php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug61097.phpt
U   php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c
A   php/php-src/trunk/ext/xmlrpc/tests/bug61097.phpt
U   php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-02-18 13:39:13 UTC (rev 323330)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-02-18 14:58:19 UTC (rev 323331)
@@ -54,6 +54,9 @@
   . Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX).
 (Laruence)

+- XMLRPC:
+  . Fixed bug #61097 (Memory leak in xmlrpc functions copying zvals). (Nikic)
+
 02 Feb 2012, PHP 5.3.10

 - Core:

Added: php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug61097.phpt
===
--- php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug61097.phpt 
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug61097.phpt 2012-02-18 
14:58:19 UTC (rev 323331)
@@ -0,0 +1,16 @@
+--TEST--
+Bug #61097 (Memory leak in xmlrpc functions copying zvals)
+--SKIPIF--
+?php if (!extension_loaded(xmlrpc)) print skip; ?
+--FILE--
+?php
+$server = xmlrpc_server_create();
+
+$method = 'abc';
+xmlrpc_server_register_introspection_callback($server, $method);
+xmlrpc_server_register_method($server, 'abc', $method);
+
+echo 'Done';
+?
+--EXPECT--
+Done

Modified: php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c
===
--- php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c2012-02-18 
13:39:13 UTC (rev 323330)
+++ php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c2012-02-18 
14:58:19 UTC (rev 323331)
@@ -1043,9 +1043,8 @@
 */
if (XMLRPC_ServerRegisterMethod(server-server_ptr, method_key, 
php_xmlrpc_callback)) {
/* save for later use */
-   MAKE_STD_ZVAL(method_name_save);
-   *method_name_save = **method_name;
-   zval_copy_ctor(method_name_save);
+   ALLOC_ZVAL(method_name_save);
+   MAKE_COPY_ZVAL(method_name, method_name_save);

/* register our php method */
add_zval(server-method_map, method_key, 
method_name_save);
@@ -1073,9 +1072,8 @@

if (type == le_xmlrpc_server) {
/* save for later use */
-   MAKE_STD_ZVAL(method_name_save);
-   *method_name_save = **method_name;
-   zval_copy_ctor(method_name_save);
+   ALLOC_ZVAL(method_name_save);
+   MAKE_COPY_ZVAL(method_name, method_name_save);

/* register our php method */
add_zval(server-introspection_map, NULL, method_name_save);

Added: php/php-src/trunk/ext/xmlrpc/tests/bug61097.phpt
===
--- php/php-src/trunk/ext/xmlrpc/tests/bug61097.phpt
(rev 0)
+++ php/php-src/trunk/ext/xmlrpc/tests/bug61097.phpt2012-02-18 14:58:19 UTC 
(rev 323331)
@@ -0,0 +1,16 @@
+--TEST--
+Bug #61097 (Memory leak in xmlrpc functions copying zvals)
+--SKIPIF--
+?php if (!extension_loaded(xmlrpc)) print skip; ?
+--FILE--
+?php
+$server = xmlrpc_server_create();
+
+$method = 'abc';
+xmlrpc_server_register_introspection_callback($server, $method);
+xmlrpc_server_register_method($server, 'abc', $method);
+
+echo 'Done';
+?
+--EXPECT--
+Done

Modified: php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c
===
--- php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c   2012-02-18 13:39:13 UTC 
(rev 323330)
+++ php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c   2012-02-18 14:58:19 UTC 
(rev 323331)
@@ -1043,9 +1043,8 @@
 */
if (XMLRPC_ServerRegisterMethod(server-server_ptr, method_key, 
php_xmlrpc_callback)) {
/* save for later use */
-   MAKE_STD_ZVAL(method_name_save);
-   *method_name_save = **method_name;
-   zval_copy_ctor(method_name_save);
+   ALLOC_ZVAL(method_name_save);
+   MAKE_COPY_ZVAL(method_name, method_name_save);

/* register our php method */
add_zval(server-method_map, method_key, 
method_name_save);
@@ -1073,9 +1072,8 @@

if (type ==

[PHP-CVS] svn: /php/php-src/trunk/sapi/cli/tests/ php_cli_server_004.phpt php_cli_server_005.phpt php_cli_server_006.phpt php_cli_server_007.phpt php_cli_server_008.phpt php_cli_server_009.phpt php_cl

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/phar/phar_object.c trunk/ext/phar/phar_object.c

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/xmlrpc/tests/bug61097.phpt branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c trunk/ext/xmlrpc/tests/bug61097.phpt trunk/ext/xmlrpc/xm

3 matches

Site Navigation

Mail list logo

Footer information