[PHP-CVS] svn: /SVNROOT/ global_avail
tyrael Mon, 18 Feb 2013 00:53:22 + Revision: http://svn.php.net/viewvc?view=revision&revision=329491 Log: karma for mignov Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2013-02-17 18:09:42 UTC (rev 329490) +++ SVNROOT/global_avail2013-02-18 00:53:22 UTC (rev 329491) @@ -372,6 +372,7 @@ avail|keminar|pecl/smtpmail,phpdoc avail|graphdat|pecl/graphdat,phpdoc avail|santiagolizardo|pecl/sdl,phpdoc +avail|mignov|pecl/virtualization/libvirt.git,phpdoc # Objective-C bridge avail|wez,jan|php/php-objc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fix protos: ext/curl/curl_file.c
Commit:17c6389e9e3e5f138872c696a80acc78e923da68
Author:Stanislav Malyshev Sun, 17 Feb 2013 13:33:48
-0800
Parents: 0841eca580d7914eaadeb4270d48f72c5c42ba2c
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=17c6389e9e3e5f138872c696a80acc78e923da68
Log:
fix protos
Changed paths:
M ext/curl/curl_file.c
Diff:
diff --git a/ext/curl/curl_file.c b/ext/curl/curl_file.c
index b7cc449..91dfd27 100644
--- a/ext/curl/curl_file.c
+++ b/ext/curl/curl_file.c
@@ -52,7 +52,7 @@ static void curlfile_ctor(INTERNAL_FUNCTION_PARAMETERS)
}
}
-/* {{{ proto string CURLFile::__construct(string $name, [string $mimetype [,
string $postfilename]])
+/* {{{ proto void CURLFile::__construct(string $name, [string $mimetype [,
string $postfilename]])
Create the CURLFile object */
ZEND_METHOD(CURLFile, __construct)
{
@@ -61,7 +61,7 @@ ZEND_METHOD(CURLFile, __construct)
}
/* }}} */
-/* {{{ proto string curl_file_create(string $name, [string $mimetype [, string
$postfilename]])
+/* {{{ proto CURLFile curl_file_create(string $name, [string $mimetype [,
string $postfilename]])
Create the CURLFile object */
PHP_FUNCTION(curl_file_create)
{
@@ -117,7 +117,7 @@ ZEND_METHOD(CURLFile, getPostFilename)
}
/* }}} */
-/* {{{ proto string CURLFile::setMimeType(string $mime)
+/* {{{ proto void CURLFile::setMimeType(string $mime)
Set MIME type */
ZEND_METHOD(CURLFile, setMimeType)
{
@@ -125,7 +125,7 @@ ZEND_METHOD(CURLFile, setMimeType)
}
/* }}} */
-/* {{{ proto string CURLFile::setPostFilename(string $name)
+/* {{{ proto void CURLFile::setPostFilename(string $name)
Set file name for POST */
ZEND_METHOD(CURLFile, setPostFilename)
{
@@ -133,7 +133,7 @@ ZEND_METHOD(CURLFile, setPostFilename)
}
/* }}} */
-/* {{{ proto string CURLFile::__wakeup()
+/* {{{ proto void CURLFile::__wakeup()
Unserialization handler */
ZEND_METHOD(CURLFile, __wakeup)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/openssl/openssl.c
Commit:0841eca580d7914eaadeb4270d48f72c5c42ba2c Author:Stanislav Malyshev Sun, 17 Feb 2013 13:29:34 -0800 Parents: 432d59ab5560202a46b01d05455418e9fc810365 7b0107cc5d3d90655957680ef9cf916dce6875a7 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0841eca580d7914eaadeb4270d48f72c5c42ba2c Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey() Bugs: https://bugs.php.net/61930 Changed paths: MM ext/openssl/openssl.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey(): NEWS ext/openssl/openssl.c ext/openssl/tests/bug61930.phpt
Commit:7b0107cc5d3d90655957680ef9cf916dce6875a7
Author:Stanislav Malyshev Sun, 17 Feb 2013 13:28:42
-0800
Parents: 92b1cb3ca0b4a62c33a6a15b0e50762cac67fc5d
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=7b0107cc5d3d90655957680ef9cf916dce6875a7
Log:
fix bug #61930: openssl corrupts ssl key resource when using
openssl_get_publickey()
Bugs:
https://bugs.php.net/61930
Changed paths:
M NEWS
M ext/openssl/openssl.c
A ext/openssl/tests/bug61930.phpt
Diff:
diff --git a/NEWS b/NEWS
index 37c1332..bedc6a4 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,10 @@ PHP
NEWS
- Mbstring:
. mb_split() can now handle empty matches like preg_split() does. (Moriyoshi)
+- OpenSSL:
+ . Fixed bug #61930 (openssl corrupts ssl key resource when using
+openssl_get_publickey()). (Stas)
+
- SPL:
. Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS).
(patch by kr...@krizalys.com, Laruence)
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 328c1ee..d7ac117 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -3204,6 +3204,7 @@ PHP_FUNCTION(openssl_pkey_get_public)
if (pkey == NULL) {
RETURN_FALSE;
}
+ zend_list_addref(Z_LVAL_P(return_value));
}
/* }}} */
@@ -3240,6 +3241,7 @@ PHP_FUNCTION(openssl_pkey_get_private)
if (pkey == NULL) {
RETURN_FALSE;
}
+ zend_list_addref(Z_LVAL_P(return_value));
}
/* }}} */
diff --git a/ext/openssl/tests/bug61930.phpt b/ext/openssl/tests/bug61930.phpt
new file mode 100644
index 000..55dc42f
--- /dev/null
+++ b/ext/openssl/tests/bug61930.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Bug #61930: openssl corrupts ssl key resource when using
openssl_get_publickey()
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+resource(%d) of type (OpenSSL key)
+int(1)
+
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/curl/interface.c
Commit:9a85dca7a566cef6bee9f07dbf9c6059dabb135c Author:Anatol Belski Sun, 17 Feb 2013 20:29:58 +0100 Parents: 8be9a974dac0c95eed50e123e5aaeee78e497974 432d59ab5560202a46b01d05455418e9fc810365 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9a85dca7a566cef6bee9f07dbf9c6059dabb135c Log: Merge branch 'PHP-5.5' * PHP-5.5: fix free vs. curl_free Changed paths: MM ext/curl/interface.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fix free vs. curl_free: ext/curl/interface.c
Commit:432d59ab5560202a46b01d05455418e9fc810365
Author:Anatol Belski Sun, 17 Feb 2013 20:29:20 +0100
Parents: d420368bc9b2fbbdc7bd4f6992cfcd153ee18ddd
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=432d59ab5560202a46b01d05455418e9fc810365
Log:
fix free vs. curl_free
Changed paths:
M ext/curl/interface.c
Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 0714148..0c29e46 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -3490,7 +3490,7 @@ PHP_FUNCTION(curl_escape)
if ((res = curl_easy_escape(ch->cp, str, str_len))) {
RETVAL_STRING(res, 1);
- free(res);
+ curl_free(res);
} else {
RETURN_FALSE;
}
@@ -3514,7 +3514,7 @@ PHP_FUNCTION(curl_unescape)
if ((out = curl_easy_unescape(ch->cp, str, str_len, &out_len))) {
RETVAL_STRINGL(out, out_len, 1);
- free(out);
+ curl_free(out);
} else {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: update NEWS: NEWS
Commit:92b1cb3ca0b4a62c33a6a15b0e50762cac67fc5d Author:Stanislav Malyshev Sun, 17 Feb 2013 02:37:58 -0800 Parents: 59b016192dd52f40591ad969e1ce7c1bfcb947a3 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=92b1cb3ca0b4a62c33a6a15b0e50762cac67fc5d Log: update NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 02e8d64..37c1332 100644 --- a/NEWS +++ b/NEWS @@ -13,6 +13,8 @@ PHP NEWS . mb_split() can now handle empty matches like preg_split() does. (Moriyoshi) - SPL: + . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS). +(patch by kr...@krizalys.com, Laruence) . Fixed bug #64106 (Segfault on SplFixedArray[][x] = y when extended). (Nikita Popov) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS sapi/cgi/cgi_main.c sapi/cli/php_cli_server.c
Commit:c877fcf6eca2a2836957a83539f6a8a4a1976ae2 Author:Stanislav Malyshev Sun, 17 Feb 2013 01:19:08 -0800 Parents: d3291de51a169b2141460ff2e432774fe84cc90e 59b016192dd52f40591ad969e1ce7c1bfcb947a3 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c877fcf6eca2a2836957a83539f6a8a4a1976ae2 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Added HTTP codes as of RFC 6585 Changed paths: MM NEWS MM sapi/cgi/cgi_main.c MM sapi/cli/php_cli_server.c Diff: diff --cc NEWS index 90a0982,02e8d64..2cabbbe --- a/NEWS +++ b/NEWS @@@ -1,18 -1,10 +1,19 @@@ PHP NEWS ||| -?? ??? 2012, PHP 5.4.13 +?? ??? 201?, PHP 5.5.0 Beta 1 - Core: + . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell) + . Fixed bug #64135 (Exceptions from set_error_handler are not always +propagated). (Laruence) + . Fixed bug #63830 (Segfault on undefined function call in nested generator). +(Nikita Popov) + . Fixed bug #60833 (self, parent, static behave inconsistently +case-sensitive). (Stas, mario at include-once dot org) + . Implemented FR #60524 (specify temp dir by php.ini). (ALeX Kazik). . Fixed bug #64142 (dval to lval different behavior on ppc64). (Remi) + . Added ARMv7/v8 versions of various Zend arithmetic functions that are +implemented using inline assembler (Ard Biesheuvel) - CLI server: . Fixed bug #64128 (buit-in web server is broken on ppc64). (Remi) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Added HTTP codes as of RFC 6585: NEWS sapi/cgi/cgi_main.c sapi/cli/php_cli_server.c sapi/fpm/fpm/fpm_main.c
Commit:59b016192dd52f40591ad969e1ce7c1bfcb947a3
Author:Jonh Wendell Fri, 8 Feb 2013
14:09:11 -0200
Committer: Stanislav Malyshev Sun, 17 Feb 2013 01:18:40
-0800
Parents: 263accb626759c92510817cd565885106aa07f4d
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=59b016192dd52f40591ad969e1ce7c1bfcb947a3
Log:
Added HTTP codes as of RFC 6585
Added descriptions for the new HTTP codes:
- 428 Precondition Required
- 429 Too Many Requests
- 431 Request Header Fields Too Large
- 511 Network Authentication Required
Changed paths:
M NEWS
M sapi/cgi/cgi_main.c
M sapi/cli/php_cli_server.c
M sapi/fpm/fpm/fpm_main.c
Diff:
diff --git a/NEWS b/NEWS
index 61fead4..02e8d64 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP
NEWS
?? ??? 2012, PHP 5.4.13
- Core:
+ . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell)
. Fixed bug #64142 (dval to lval different behavior on ppc64). (Remi)
- CLI server:
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 35402a4..c8dfec0 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -384,12 +384,16 @@ static const http_error http_error_codes[] = {
{413, "Request Entity Too Large"},
{414, "Request-URI Too Large"},
{415, "Unsupported Media Type"},
+ {428, "Precondition Required"},
+ {429, "Too Many Requests"},
+ {431, "Request Header Fields Too Large"},
{500, "Internal Server Error"},
{501, "Not Implemented"},
{502, "Bad Gateway"},
{503, "Service Unavailable"},
{504, "Gateway Time-out"},
{505, "HTTP Version not supported"},
+ {511, "Network Authentication Required"},
{0, NULL}
};
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 6a4e7c5..ab7f4cf 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -236,12 +236,16 @@ static php_cli_server_http_reponse_status_code_pair
status_map[] = {
{ 415, "Unsupported Media Type" },
{ 416, "Requested Range Not Satisfiable" },
{ 417, "Expectation Failed" },
+ { 428, "Precondition Required" },
+ { 429, "Too Many Requests" },
+ { 431, "Request Header Fields Too Large" },
{ 500, "Internal Server Error" },
{ 501, "Not Implemented" },
{ 502, "Bad Gateway" },
{ 503, "Service Unavailable" },
{ 504, "Gateway Timeout" },
{ 505, "HTTP Version Not Supported" },
+ { 511, "Network Authentication Required" },
};
static php_cli_server_http_reponse_status_code_pair template_map[] = {
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index 40810f0..61088c4 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -375,12 +375,16 @@ static const http_error http_error_codes[] = {
{413, "Request Entity Too Large"},
{414, "Request-URI Too Large"},
{415, "Unsupported Media Type"},
+ {428, "Precondition Required"},
+ {429, "Too Many Requests"},
+ {431, "Request Header Fields Too Large"},
{500, "Internal Server Error"},
{501, "Not Implemented"},
{502, "Bad Gateway"},
{503, "Service Unavailable"},
{504, "Gateway Time-out"},
{505, "HTTP Version not supported"},
+ {511, "Network Authentication Required"},
{0, NULL}
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
