diff options
Diffstat (limited to 'ext/xmlrpc')
| -rw-r--r-- | ext/xmlrpc/php_xmlrpc.h | 4 | ||||
| -rw-r--r-- | ext/xmlrpc/tests/bug51288.phpt | 2 | ||||
| -rw-r--r-- | ext/xmlrpc/xmlrpc-epi-php.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ext/xmlrpc/php_xmlrpc.h b/ext/xmlrpc/php_xmlrpc.h index 754fabfa2..663d51661 100644 --- a/ext/xmlrpc/php_xmlrpc.h +++ b/ext/xmlrpc/php_xmlrpc.h @@ -37,7 +37,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | + | Copyright (c) 1997-2012 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -51,7 +51,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlrpc.h 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: php_xmlrpc.h 321634 2012-01-01 13:15:04Z felipe $ */ #ifndef _PHP_XMLRPC_H #define _PHP_XMLRPC_H diff --git a/ext/xmlrpc/tests/bug51288.phpt b/ext/xmlrpc/tests/bug51288.phpt index d9bdef822..ba341369b 100644 --- a/ext/xmlrpc/tests/bug51288.phpt +++ b/ext/xmlrpc/tests/bug51288.phpt @@ -1,5 +1,7 @@ --TEST-- Bug #51288 (CVE-2010-0397, NULL pointer deref when no <methodName> in request) +--SKIPIF-- +<?php if (!extension_loaded("xmlrpc")) print "skip"; ?> --FILE-- <?php $method = NULL; diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index b14b5584b..4952b61f7 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -37,7 +37,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | + | Copyright (c) 1997-2012 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -51,7 +51,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xmlrpc-epi-php.c 313665 2011-07-25 11:42:53Z felipe $ */ +/* $Id: xmlrpc-epi-php.c 321634 2012-01-01 13:15:04Z felipe $ */ /********************************************************************** * BUGS: * |