[PHP-CVS] com php-src: - update NEWS: NEWS
Commit:fda25d97ffa4e623b824aa70f0ba98e9eba88ef7 Author:Pierre Joye pierre@gmail.com Wed, 21 Mar 2012 07:06:07 +0100 Parents: baeaafd3951451c7dadf949c7677e90141c1e17a Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fda25d97ffa4e623b824aa70f0ba98e9eba88ef7 Log: - update NEWS Changed paths: M NEWS Diff: fda25d97ffa4e623b824aa70f0ba98e9eba88ef7 diff --git a/NEWS b/NEWS index a2d7c05..1b1db1e 100644 --- a/NEWS +++ b/NEWS @@ -25,6 +25,9 @@ PHP NEWS . Fixed bug #60227 (header() cannot detect the multi-line header with CR). (rui, Gustavo) . Fixed bug #60222 (time_nanosleep() does validate input params). (Ilia) + . Fixed bug #54374 (Insufficient validating of upload name leading to +corrupted $_FILES indices). (CVE-2012-1172). (Stas, lekensteyn at +gmail dot com, Pierre) . Fixed bug #52719 (array_walk_recursive crashes if third param of the function is by reference). (Nikita Popov) . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - test commit for log mail: NEWS
Commit:d11f4eddcc0910c732fa7cc60894ac07e89771ba Author:Pierre Joye pierre@gmail.com Wed, 21 Mar 2012 07:34:46 +0100 Parents: 2288e0eed1f7d13d0dd79714215184bd075416b9 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d11f4eddcc0910c732fa7cc60894ac07e89771ba Log: - test commit for log mail Changed paths: M NEWS Diff: d11f4eddcc0910c732fa7cc60894ac07e89771ba diff --git a/NEWS b/NEWS index b945eff..a6c1735 100644 --- a/NEWS +++ b/NEWS @@ -3,7 +3,7 @@ PHP NEWS ?? ??? 201?, PHP 5.5.0 - General improvements: - . Drop Windows XP and 2003 support. (Pierre) + . Drop Windows XP and 2003 support. (Pierre ) . World domination - cURL: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, svn revision 321664: main/rfc1867.c
Commit:95dcd799fb6fdccbc60d3bba3cd759f6b421ee69
Author:Pierre Joye pierre@gmail.com Wed, 21 Mar 2012 06:58:55
+0100
Parents: cb4e82a1cc16457da224dd045842583c69bfa00e
Branches: PHP-5.3
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=95dcd799fb6fdccbc60d3bba3cd759f6b421ee69
Log:
- merge fix bug #54374, bug #55500 - filter file names better, no dangling [s,
svn revision 321664
Bugs:
https://bugs.php.net/54374
https://bugs.php.net/55500
Changed paths:
M main/rfc1867.c
Diff:
95dcd799fb6fdccbc60d3bba3cd759f6b421ee69
diff --git a/main/rfc1867.c b/main/rfc1867.c
index ddde3e7..31605cf 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -1015,6 +1015,10 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /*
{{{ */
}
tmp++;
}
+ /* Brackets should always be closed */
+ if(c != 0) {
+ skip_upload = 1;
+ }
}
total_bytes = cancel_upload = 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - add test for bug #55000 and #54374: tests/basic/bug55500.phpt
Commit:baeaafd3951451c7dadf949c7677e90141c1e17a
Author:Pierre Joye pierre@gmail.com Wed, 21 Mar 2012 07:00:22
+0100
Parents: 95dcd799fb6fdccbc60d3bba3cd759f6b421ee69
Branches: PHP-5.3
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=baeaafd3951451c7dadf949c7677e90141c1e17a
Log:
- add test for bug #55000 and #54374
Bugs:
https://bugs.php.net/55000
https://bugs.php.net/54374
Changed paths:
A tests/basic/bug55500.phpt
Diff:
baeaafd3951451c7dadf949c7677e90141c1e17a
diff --git a/tests/basic/bug55500.phpt b/tests/basic/bug55500.phpt
new file mode 100644
index 000..97eeea2
--- /dev/null
+++ b/tests/basic/bug55500.phpt
@@ -0,0 +1,68 @@
+--TEST--
+Bug #55500 (Corrupted $_FILES indices lead to security concern)
+--INI--
+file_uploads=1
+error_reporting=E_ALL~E_NOTICE
+upload_max_filesize=1024
+max_file_uploads=10
+--POST_RAW--
+Content-Type: multipart/form-data;
boundary=---20896060251896012921717172737
+-20896060251896012921717172737
+Content-Disposition: form-data; name=file[]; filename=file1.txt
+Content-Type: text/plain-file1
+
+1
+-20896060251896012921717172737
+Content-Disposition: form-data; name=file[[type]; filename=file2.txt
+Content-Type: text/plain-file2
+
+2
+-20896060251896012921717172737
+Content-Disposition: form-data; name=file[[name]; filename=file3.txt
+Content-Type: text/plain-file3
+
+3
+-20896060251896012921717172737
+Content-Disposition: form-data; name=file[name][; filename=file4.txt
+Content-Type: text/plain-file3
+
+4
+-20896060251896012921717172737--
+--FILE--
+?php
+var_dump($_FILES);
+var_dump($_POST);
+?
+--EXPECTF--
+array(1) {
+ [%u|b%file]=
+ array(5) {
+[%u|b%name]=
+array(1) {
+ [0]=
+ %unicode|string%(9) file1.txt
+}
+[%u|b%type]=
+array(1) {
+ [0]=
+ %unicode|string%(16) text/plain-file1
+}
+[%u|b%tmp_name]=
+array(1) {
+ [0]=
+ %unicode|string%(%d) %s
+}
+[%u|b%error]=
+array(1) {
+ [0]=
+ int(0)
+}
+[%u|b%size]=
+array(1) {
+ [0]=
+ int(1)
+}
+ }
+}
+array(0) {
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #61461 (missing checks around malloc() calls).: NEWS sapi/cli/php_cli_server.c
Commit:9dcfb8c73fd639485182497ae5a8fc7d7ca7eb11
Author:Ilia Alshanetsky ili...@php.net Tue, 20 Mar 2012 21:07:08
-0400
Parents: f3f76e5e8af265cd59d8edb7fb0827be6abc9a5a
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=9dcfb8c73fd639485182497ae5a8fc7d7ca7eb11
Log:
Fixed bug #61461 (missing checks around malloc() calls).
Bugs:
https://bugs.php.net/61461
Changed paths:
M NEWS
M sapi/cli/php_cli_server.c
Diff:
9dcfb8c73fd639485182497ae5a8fc7d7ca7eb11
diff --git a/NEWS b/NEWS
index ae0d190..af4f4c9 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP
NEWS
?? ??? 2012, PHP 5.4.1 RC1
- CLI Server:
+ . Fixed bug #61461 (missing checks around malloc() calls). (Ilia)
. Implemented FR #60850 (Built in web server does not set
$_SERVER['SCRIPT_FILENAME'] when using router). (Laruence)
. Connection: close instead of Connection: closed (Gustavo)
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 88f5d78..79ccea3 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -1281,6 +1281,10 @@ static void
php_cli_server_request_translate_vpath(php_cli_server_request *reque
size_t prev_patch_len;
int is_static_file = 0;
+ if (!buf) {
+ return;
+ }
+
memmove(p, document_root, document_root_len);
p += document_root_len;
vpath = p;
@@ -1536,6 +1540,9 @@ static int
php_cli_server_client_read_request_on_body(php_http_parser *parser, c
php_cli_server_client *client = parser-data;
if (!client-request.content) {
client-request.content = pemalloc(parser-content_length, 1);
+ if (!client-request.content) {
+ return -1;
+ }
client-request.content_len = 0;
}
memmove(client-request.content + client-request.content_len, at,
length);
@@ -1606,6 +1613,9 @@ static int
php_cli_server_client_read_request(php_cli_server_client *client, cha
}
if (client-current_header_name) {
char *header_name =
safe_pemalloc(client-current_header_name_len, 1, 1, 1);
+ if (!header_name) {
+ return -1;
+ }
memmove(header_name, client-current_header_name,
client-current_header_name_len);
client-current_header_name = header_name;
client-current_header_name_allocated = 1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - revert test commit: NEWS
Commit:363a3218e24e89fbf5ae70948dd5368b519a5573 Author:Pierre Joye pierre@gmail.com Wed, 21 Mar 2012 08:30:33 +0100 Parents: d11f4eddcc0910c732fa7cc60894ac07e89771ba Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=363a3218e24e89fbf5ae70948dd5368b519a5573 Log: - revert test commit Changed paths: M NEWS Diff: 363a3218e24e89fbf5ae70948dd5368b519a5573 diff --git a/NEWS b/NEWS index a6c1735..b945eff 100644 --- a/NEWS +++ b/NEWS @@ -3,7 +3,7 @@ PHP NEWS ?? ??? 201?, PHP 5.5.0 - General improvements: - . Drop Windows XP and 2003 support. (Pierre ) + . Drop Windows XP and 2003 support. (Pierre) . World domination - cURL: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Always keep the NEWS file from the branch when merging: .gitattributes
Commit:944e622821ebd8ab62bcb3513f6b9e7bcc998b04 Author:David Soria Parra d...@php.net Wed, 21 Mar 2012 12:38:43 +0100 Parents: fda25d97ffa4e623b824aa70f0ba98e9eba88ef7 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=944e622821ebd8ab62bcb3513f6b9e7bcc998b04 Log: Always keep the NEWS file from the branch when merging We usually don't want to touch the NEWS files when we merge and have the news items not merged by git. Therefore we tell git to use the 'ours' strategy for the NEWS file. Changed paths: M .gitattributes Diff: 944e622821ebd8ab62bcb3513f6b9e7bcc998b04 diff --git a/.gitattributes b/.gitattributes index 9276652..d8ee5cb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,3 +21,4 @@ sapi/nsapi/nsapi.c ident sapi/continuity/capi.c ident Zend/RFCs/002.txt ident Zend/RFCs/003.txt ident +NEWSmerge=ours -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #61453.: NEWS ext/spl/spl_observer.c ext/spl/tests/bug61453.phpt
Commit:0f001703a8987960de041b216a023869ab439857
Author:Gustavo André dos Santos Lopes cataphr...@php.net Wed, 21
Mar 2012 12:39:30 +
Parents: 1e18f11c9ab56fb120c9e26ecd3f68f0651cddde
Branches: PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=0f001703a8987960de041b216a023869ab439857
Log:
Fixed bug #61453.
The hash function used strncpy on data that would have NUL bytes, ending the
copy prematurely and causing collisions between objects.
Bugs:
https://bugs.php.net/61453
Changed paths:
M NEWS
M ext/spl/spl_observer.c
A ext/spl/tests/bug61453.phpt
Diff:
0f001703a8987960de041b216a023869ab439857
diff --git a/NEWS b/NEWS
index af4f4c9..530159c 100644
--- a/NEWS
+++ b/NEWS
@@ -96,6 +96,8 @@ PHP
NEWS
ReflectionMethod::invokeArgs()). (Laruence)
- SPL:
+ . Fixed bug #61453 (SplObjectStorage does not identify objects correctly).
+(Gustavo)
. Fixed bug #61347 (inconsistent isset behavior of Arrayobject). (Laruence)
- Standard:
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
index 5eaa8fd..4b8be82 100755
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
@@ -146,14 +146,14 @@ static char
*spl_object_storage_get_hash(spl_SplObjectStorage *intern, zval *thi
return (char*)Z_OBJVAL_P(obj);
#else
- char *hash = emalloc((hash_len+1)*sizeof(char));
+ char *hash = emalloc(hash_len + 1);
zend_object_value zvalue;
memset(zvalue, 0, sizeof(zend_object_value));
zvalue.handle = Z_OBJ_HANDLE_P(obj);
zvalue.handlers = Z_OBJ_HT_P(obj);
- strncpy(hash, (char *)zvalue, hash_len);
+ memcpy(hash, (char *)zvalue, hash_len);
hash[hash_len] = 0;
if (hash_len_ptr) {
diff --git a/ext/spl/tests/bug61453.phpt b/ext/spl/tests/bug61453.phpt
new file mode 100644
index 000..e5b1387
--- /dev/null
+++ b/ext/spl/tests/bug61453.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Bug #61453:SplObjectStorage does not identify objects correctly
+--FILE--
+?php
+$limit = 1000;
+$objects = new SplObjectStorage;
+for($i = 0; $i $limit; $i++){
+ $object = new StdClass;
+
+ if(isset($objects[$object])){
+ die(this should never happen, but did after $i iteration);
+ }
+
+ $objects[$object] = 1;
+}
+?
+==DONE==
+--EXPECT--
+==DONE==
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #49853 (Soap Client stream context header option ignored): NEWS ext/soap/php_http.c ext/soap/php_http.h ext/soap/php_sdl.c
Commit:657547f8c4758efcf85c73fec6d7fd8b3983d7cb
Author:Dmitry Stogov dmi...@zend.com Wed, 21 Mar 2012 16:32:49
+0400
Parents: 944e622821ebd8ab62bcb3513f6b9e7bcc998b04
Branches: PHP-5.3
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=657547f8c4758efcf85c73fec6d7fd8b3983d7cb
Log:
Fixed bug #49853 (Soap Client stream context header option ignored)
Bugs:
https://bugs.php.net/49853
Changed paths:
M NEWS
M ext/soap/php_http.c
M ext/soap/php_http.h
M ext/soap/php_sdl.c
657547f8c4758efcf85c73fec6d7fd8b3983d7cb
diff --git a/NEWS b/NEWS
index 1b1db1e..6866355 100644
--- a/NEWS
+++ b/NEWS
@@ -92,6 +92,8 @@ PHP
NEWS
User-Agent header). (carloschilazo at gmail dot com)
. Fixed bug #60842, #51775 (Chunked response parsing error when
chunksize length line is 10 bytes). (Ilia)
+ . Fixed bug #49853 (Soap Client stream context header option ignored).
+(Dmitry)
- SPL
. Fixed memory leak when calling SplFileInfo's constructor twice. (Felipe)
diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c
index c414bba..358877d 100644
--- a/ext/soap/php_http.c
+++ b/ext/soap/php_http.c
@@ -32,7 +32,7 @@ static int get_http_headers(php_stream *socketd,char
**response, int *out_size T
smart_str_appendl(str,const,sizeof(const)-1)
/* Proxy HTTP Authentication */
-void proxy_authentication(zval* this_ptr, smart_str* soap_headers TSRMLS_DC)
+int proxy_authentication(zval* this_ptr, smart_str* soap_headers TSRMLS_DC)
{
zval **login, **password;
@@ -53,11 +53,13 @@ void proxy_authentication(zval* this_ptr, smart_str*
soap_headers TSRMLS_DC)
smart_str_append_const(soap_headers, \r\n);
efree(buf);
smart_str_free(auth);
+ return 1;
}
+ return 0;
}
/* HTTP Authentication */
-void basic_authentication(zval* this_ptr, smart_str* soap_headers TSRMLS_DC)
+int basic_authentication(zval* this_ptr, smart_str* soap_headers TSRMLS_DC)
{
zval **login, **password;
@@ -79,6 +81,78 @@ void basic_authentication(zval* this_ptr, smart_str*
soap_headers TSRMLS_DC)
smart_str_append_const(soap_headers, \r\n);
efree(buf);
smart_str_free(auth);
+ return 1;
+ }
+ return 0;
+}
+
+/* Additional HTTP headers */
+void http_context_headers(php_stream_context* context,
+ zend_bool has_authorization,
+ zend_bool has_proxy_authorization,
+ zend_bool has_cookies,
+ smart_str* soap_headers TSRMLS_DC)
+{
+ zval **tmp;
+
+ if (context
+ php_stream_context_get_option(context, http, header, tmp)
== SUCCESS
+ Z_TYPE_PP(tmp) == IS_STRING Z_STRLEN_PP(tmp)) {
+ char *s = Z_STRVAL_PP(tmp);
+ char *p;
+ int name_len;
+
+ while (*s) {
+ /* skip leading newlines and spaces */
+ while (*s == ' ' || *s == '\t' || *s == '\r' || *s ==
'\n') {
+ s++;
+ }
+ /* extract header name */
+ p = s;
+ name_len = -1;
+ while (*p) {
+ if (*p == ':') {
+ if (name_len 0) name_len = p - s;
+ break;
+ } else if (*p == ' ' || *p == '\t') {
+ if (name_len 0) name_len = p - s;
+ } else if (*p == '\r' || *p == '\n') {
+ break;
+ }
+ p++;
+ }
+ if (*p == ':') {
+ /* extract header value */
+ while (*p *p != '\r' *p != '\n') {
+ p++;
+ }
+ /* skip some predefined headers */
+ if ((name_len != sizeof(host)-1 ||
+strncasecmp(s, host, sizeof(host)-1)
!= 0)
+ (name_len != sizeof(connection)-1 ||
+strncasecmp(s, connection,
sizeof(connection)-1) != 0)
+ (name_len != sizeof(user-agent)-1 ||
+strncasecmp(s, user-agent,
sizeof(user-agent)-1) != 0)
+ (name_len != sizeof(content-length)-1 ||
+strncasecmp(s, content-length,
sizeof(content-length)-1) != 0)
+ (name_len != sizeof(content-type)-1 ||
+
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4: NEWS
Commit:09e367dbaffa1e8c5ba7b88e9997d9ddc1c6d0c0 Author:Dmitry Stogov dmi...@zend.com Wed, 21 Mar 2012 16:51:24 +0400 Parents: a8cc0b05b45110ccf408ea9410447bf82b8826f2 0f001703a8987960de041b216a023869ab439857 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=09e367dbaffa1e8c5ba7b88e9997d9ddc1c6d0c0 Log: Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 Changed paths: MM NEWS Diff: 09e367dbaffa1e8c5ba7b88e9997d9ddc1c6d0c0 diff --combined NEWS index ed26589,530159c..cc2de2e --- a/NEWS +++ b/NEWS @@@ -73,8 -73,6 +73,8 @@@ PH User-Agent header). (carloschilazo at gmail dot com) . Fixed bug #60842, #51775 (Chunked response parsing error when chunksize length line is 10 bytes). (Ilia) + . Fixed bug #49853 (Soap Client stream context header option ignored). +(Dmitry) - PDO . Fixed bug #61292 (Segfault while calling a method on an overloaded PDO @@@ -98,6 -96,8 +98,8 @@@ ReflectionMethod::invokeArgs()). (Laruence) - SPL: + . Fixed bug #61453 (SplObjectStorage does not identify objects correctly). + (Gustavo) . Fixed bug #61347 (inconsistent isset behavior of Arrayobject). (Laruence) - Standard: -- 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.3' into PHP-5.4: NEWS ext/soap/php_http.c ext/soap/php_sdl.c
Commit:a8cc0b05b45110ccf408ea9410447bf82b8826f2 Author:Dmitry Stogov dmi...@zend.com Wed, 21 Mar 2012 16:42:08 +0400 Parents: 1e18f11c9ab56fb120c9e26ecd3f68f0651cddde 657547f8c4758efcf85c73fec6d7fd8b3983d7cb Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a8cc0b05b45110ccf408ea9410447bf82b8826f2 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed bug #49853 (Soap Client stream context header option ignored) Conflicts: NEWS ext/soap/php_sdl.c Bugs: https://bugs.php.net/49853 Changed paths: MM NEWS MM ext/soap/php_http.c MM ext/soap/php_sdl.c a8cc0b05b45110ccf408ea9410447bf82b8826f2 diff --combined NEWS index af4f4c9,6866355..ed26589 --- a/NEWS +++ b/NEWS @@@ -1,43 -1,36 +1,43 @@@ PHP NEWS ||| -?? ??? 2012, PHP 5.3.11 +?? ??? 2012, PHP 5.4.1 RC1 + +- CLI Server: + . Fixed bug #61461 (missing checks around malloc() calls). (Ilia) + . Implemented FR #60850 (Built in web server does not set +$_SERVER['SCRIPT_FILENAME'] when using router). (Laruence) + . Connection: close instead of Connection: closed (Gustavo) - Core: - . Fixed bug #61273 (call_user_func_array with more than 16333 arguments + . Fixed bug #61374 (html_entity_decode tries to decode code points that don't +exist in ISO-8859-1). (Gustavo) + . Fixed bug #61273 (call_user_func_array with more than 16333 arguments leaks / crashes). (Laruence) + . Fixed bug #61225 (Incorrect lexing of 0b00*+NUM). (Pierrick) . Fixed bug #61165 (Segfault - strip_tags()). (Laruence) - . Improved max_input_vars directive to check nested variables (Dmitry). - . Fixed bug #61095 (Incorect lexing of 0x00*+NUM). (Etienne) + . Fixed bug #61106 (Segfault when using header_register_callback). (Nikita +Popov) . Fixed bug #61087 (Memory leak in parse_ini_file when specifying invalid scanner mode). (Nikic, Laruence) . Fixed bug #61072 (Memory leak when restoring an exception handler). (Nikic, Laruence) . Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX). - (Laruence) - . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical - vars). (Laruence) - . Fix bug #60895 (Possible invalid handler usage in windows random -functions). (Pierre) - . Fixed bug #60825 (Segfault when running symfony 2 tests). -(Dmitry, Laruence) +(Laruence) + . Fixed bug #61052 (Missing error check in trait 'insteadof' clause). (Stefan) + . Fixed bug #61011 (Crash when an exception is thrown by __autoload +accessing a static property). (Laruence) + . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical +vars). (Laruence) + . Fixed bug #60978 (exit code incorrect). (Laruence) + . Fixed bug #60911 (Confusing error message when extending traits). (Stefan) . Fixed bug #60801 (strpbrk() mishandles NUL byte). (Adam) + . Fixed bug #60717 (Order of traits in use statement can cause a fatal +error). (Stefan) + . Fixed bug #60573 (type hinting with self keyword causes weird errors). +(Laruence) . Fixed bug #60569 (Nullbyte truncates Exception $message). (Ilia) - . Fixed bug #60227 (header() cannot detect the multi-line header with CR). -(rui, Gustavo) - . Fixed bug #60222 (time_nanosleep() does validate input params). (Ilia) - . Fixed bug #54374 (Insufficient validating of upload name leading to -corrupted $_FILES indices). (CVE-2012-1172). (Stas, lekensteyn at -gmail dot com, Pierre) . Fixed bug #52719 (array_walk_recursive crashes if third param of the function is by reference). (Nikita Popov) - . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry) - FPM . Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c). @@@ -50,504 -43,99 +50,506 @@@ - Installation . Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones) -- Fileinfo - . Fixed bug #61173 (Unable to detect error from finfo constructor). (Gustavo) - -- Firebird Database extension (ibase): - . Fixed bug #60802 (ibase_trans() gives segfault when passing params). +- mbstring: + . MFH mb_ereg_replace_callback() for security enhancements. (Rui) - mysqli . Fixed bug #61003 (mysql_stat() require a valid connection). (Johannes). -- PDO_mysql - . Fixed bug #61207 (PDO::nextRowset() after a multi-statement query doesn't -always work). (Johannes) - . Fixed bug #61194 (PDO should export compression flag with myslqnd). +- mysqlnd + . Fixed bug #60948 (mysqlnd FTBFS when -Wformat-security is enabled). (Johannes) -- PDO_odbc - . Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). (Ilia) - -- PDO_pgsql - . Fixed bug #61267 (pdo_pgsql's PDO::exec() returns the number of SELECTed
[PHP-CVS] svn: /SVNROOT/ global_avail
dsp Wed, 21 Mar 2012 14:09:54 + Revision: http://svn.php.net/viewvc?view=revisionrevision=324417 Log: give fa karma to karma Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2012-03-21 12:58:41 UTC (rev 324416) +++ SVNROOT/global_avail2012-03-21 14:09:54 UTC (rev 324417) @@ -9,7 +9,7 @@ avail||playground.git # People that have access to the Karma implementation that is usedon git.php.net -avail|dsp,irker,derick|karma.git +avail|dsp,irker,derick,fa|karma.git # Some people also have access to the configuration files in the SVNROOT. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com karma: Fix format of the bugsweb post: hooks/post-receive.bugsweb
Commit:228b3322b737e364c3cbaf37567142768e015f92
Author:Florian Anderiasch f...@php.net Wed, 21 Mar 2012 15:07:54
+0100
Parents: bacc09d8928b6a04b9e8337d089eebd96f4a795d
Branches: master
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=228b3322b737e364c3cbaf37567142768e015f92
Log:
Fix format of the bugsweb post
Changed paths:
M hooks/post-receive.bugsweb
Diff:
228b3322b737e364c3cbaf37567142768e015f92
diff --git a/hooks/post-receive.bugsweb b/hooks/post-receive.bugsweb
index 683ffe2..6bf432e 100755
--- a/hooks/post-receive.bugsweb
+++ b/hooks/post-receive.bugsweb
@@ -71,8 +71,9 @@ foreach ($rpath as $commit) {
$commit_info = array();
$commit_info['log_message'] = $commitMsg;
$commit_info['author'] = $committer;
+$commit_info['author'] = preg_replace(#@php\.net$#, , $committer);
$viewvc_url_prefix = sprintf(
-'http://git.php.net/?p=%s.git;a=commit;h=',
+'http://git.php.net/?p=%s;a=commit;h=',
$hook-getRepositoryName()
);
$REV = $commitHash;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com karma: Add dsp's multi-STDIN fix: hooks/post-receive
Commit:89727c1b8c23217fafd72f06664648f350b0e525 Author:Florian Anderiasch f...@php.net Wed, 21 Mar 2012 15:22:34 +0100 Parents: ce38e2cad55e0530306df767261624505f9bf448 Branches: master Link: http://git.php.net/?p=karma.git;a=commitdiff;h=89727c1b8c23217fafd72f06664648f350b0e525 Log: Add dsp's multi-STDIN fix Changed paths: M hooks/post-receive Diff: 89727c1b8c23217fafd72f06664648f350b0e525 diff --git a/hooks/post-receive b/hooks/post-receive index 2016acb..74fce6b 100755 --- a/hooks/post-receive +++ b/hooks/post-receive @@ -1,4 +1,5 @@ #!/bin/sh -[ -f 'hooks/post-receive.mail' ] hooks/post-receive.mail -[ -f 'hooks/post-receive.bugsweb' ] hooks/post-receive.bugsweb +in=$(cat) +[ -f 'hooks/post-receive.mail' ] (echo $in | hooks/post-receive.mail ) +[ -f 'hooks/post-receive.bugsweb' ] (echo $in | hooks/post-receive.bugsweb ) [ -f 'hooks/post-receive.mirror' ] hooks/post-receive.mirror -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com karma: Fix the bugsweb POST template: hooks/post-receive.bugsweb
Commit:d7109df39a028fec7e5603073147647b471c9b8a
Author:Florian Anderiasch f...@php.net Wed, 21 Mar 2012 15:30:32
+0100
Parents: 89727c1b8c23217fafd72f06664648f350b0e525
Branches: master
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=d7109df39a028fec7e5603073147647b471c9b8a
Log:
Fix the bugsweb POST template
Changed paths:
M hooks/post-receive.bugsweb
Diff:
d7109df39a028fec7e5603073147647b471c9b8a
diff --git a/hooks/post-receive.bugsweb b/hooks/post-receive.bugsweb
index 6bf432e..030997c 100755
--- a/hooks/post-receive.bugsweb
+++ b/hooks/post-receive.bugsweb
@@ -17,9 +17,6 @@ include 'Git/PushInformation.php';
include 'Git/ReceiveHook.php';
include 'Git/BugsWebPostReceiveHook.php';
-$recipients = exec('git config hooks.mailinglist');
-$emailPrefix = exec('git config hooks.emailprefix') ?: '[git]';
-
$user = null;
if (getenv('REMOTE_USER')) {
$user = getenv('REMOTE_USER');
@@ -28,13 +25,10 @@ if (getenv('REMOTE_USER')) {
$user = getenv('GL_USER');
}
-$hook = new \Git\BugsWebPostReceiveHook(KARMA_FILE, REPOSITORY_PATH);
-$rpath = $hook-getReceivedMessages(
-getenv('GL_REPO_BASE_ABS') ?: REPOSITORY_PATH,
-$user,
-getenv('USERS_DB_FILE') ?: USERS_DB_FILE,
-$recipients,
-$emailPrefix);
+$hook = new \Git\BugsWebPostReceiveHook(
+getenv('GL_REPO_BASE_ABS') ?: REPOSITORY_PATH
+);
+$rpath = $hook-getReceivedMessages();
$template = Automatic comment from GIT on behalf of %s
Revision: http://git.php.net/%s
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com karma: Simplify getting branches and revision: lib/Git/PostReceiveHook.php
Commit:e853ff5ac82d47cc9fec784e51a334b26486f529
Author:David Soria Parra d...@php.net Wed, 21 Mar 2012 19:20:39
+0100
Parents: d7109df39a028fec7e5603073147647b471c9b8a
Branches: master
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=e853ff5ac82d47cc9fec784e51a334b26486f529
Log:
Simplify getting branches and revision
Changed paths:
M lib/Git/PostReceiveHook.php
e853ff5ac82d47cc9fec784e51a334b26486f529
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index b7efb42..7d9b2c1 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -78,140 +78,26 @@ class PostReceiveHook extends ReceiveHook
}
}
}
-$this-alreadyExistsBranches = array_diff($this-allBranches,
$newBranches);
//send mails per ref push
+$revisions = [];
+
foreach ($this-refs as $ref) {
if ($ref['reftype'] == self::REF_TAG) {
$this-sendTagMail($ref['refname'], $ref['changetype'],
$ref['old'], $ref['new']);
}
-}
-foreach($this-refs as $ref) {
-// magic populate the $this-revisions
-if ($ref['changetype'] != self::TYPE_DELETED) {
-$this-getBranchRevisions($ref['refname'], $ref['changetype'],
$ref['old'], $ref['new']);
-}
-}
-//send mails per commit
-foreach ($this-revisions as $revision = $branches) {
-// check if it commit was already in other branches
-if (!$this-isRevExistsInBranches($revision,
array_diff($this-allBranches, $branches))) {
-$this-sendCommitMail($revision, $branches);
-}
+$revisions = array_merge(
+$revisions,
+$this-getRevisions(escapeshellarg($ref['old'] . '..' .
$ref['new'])));
}
-}
-/**
- * Send mail about branch.
- * Subject: [git] [branch] %PROJECT%: %STATUS% branch %BRANCH_NAME%
- * Body:
- * Branch %BRANCH_NAME% in %PROJECT% was %STATUS%
- * Date: Thu, 08 Mar 2012 12:39:48 +(current mail date)
- *
- * Link:
http://git.php.net/?p=%PROJECT_PATH%;a=log;h=%SHA_NEW%;hp=%SHA_OLD%
- *
- * --part1--
- * Log:
- *
- * --per commit--
- * Commit: %SHA%
- * Author: %USER% Thu, 08 Mar 2012 12:39:48
+
- * Committer: %USER% Thu, 08 Mar 2012
12:39:48 +
- * Link: http://git.php.net/?p=%PROJECT_PATH%;a=commitdiff;h=%SHA%
- * Shortlog: %COMMIT_SUBJECT%
- * --/per commit--
- *
- * --/part1--
- *
- * @param string $name branch fullname (refs/heads/example)
- * @param int $changeType delete, create or update
- * @param string $oldrev old revision
- * @param string $newrev new revision
- * @return string mail uniq id
- */
-private function sendBranchMail($name, $changeType, $oldrev, $newrev)
-{
-
-$logString = '';
-$status = [self::TYPE_UPDATED = 'update', self::TYPE_CREATED =
'create', self::TYPE_DELETED = 'delete'];
-$shortname = str_replace('refs/heads/', '', $name);
-
-// forced push
-if ($changeType == self::TYPE_UPDATED) {
-$replacedRevisions = $this-getRevisions(escapeshellarg($newrev .
'..' . $oldrev)) ?: false;
-} else {
-$replacedRevisions = false;
-}
-
-if ($changeType != self::TYPE_DELETED) {
-
-$revisions = $this-getBranchRevisions($name, $changeType,
$oldrev, $newrev);
-
-if (count($revisions)) {
-
-$logString = '';
-
-foreach ($revisions as $revision) {
-$commitInfo = $this-getCommitInfo($revision);
-$logString .= 'Commit:' . $revision . \n;
-$logString .= 'Author:' . $commitInfo['author'] . ' '
. $commitInfo['author_email'] . ' ' . $commitInfo['author_date'] .
\n;
-if (($commitInfo['author'] != $commitInfo['committer']) ||
($commitInfo['author_email'] != $commitInfo['committer_email'])) {
-$logString .= 'Committer: ' . $commitInfo['committer']
. ' ' . $commitInfo['committer_email'] . ' ' .
$commitInfo['committer_date'] . \n;
-}
-$logString .= 'Link: http://git.php.net/?p=' .
$this-getRepositoryName() . ;a=commitdiff;h= . $revision . \n;
-$logString .= 'Shortlog: ' . $commitInfo['subject'] .
\n;
-$logString .= \n;
-
-}
-}
+foreach (array_unique($revisions) as $revision) {
+$this-sendCommitMail($revision);
}
-$mail = new \Mail();
-$mail-setSubject($this-emailPrefix . 'push ' .
$this-getRepositoryShortName() . ': ' . $status[$changeType] . ' branch ' .
$shortname);
-
-$message = 'Branch ' . $shortname .
[PHP-CVS] com karma: Simplify getting branches and revision: lib/Git/PostReceiveHook.php
Commit:0b695d086de59588b192276afa68de38a8e35a88
Author:David Soria Parra d...@php.net Wed, 21 Mar 2012 19:20:39
+0100
Parents: d7109df39a028fec7e5603073147647b471c9b8a
Branches:
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=0b695d086de59588b192276afa68de38a8e35a88
Log:
Simplify getting branches and revision
Changed paths:
M lib/Git/PostReceiveHook.php
0b695d086de59588b192276afa68de38a8e35a88
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index b7efb42..1e18195 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -78,140 +78,26 @@ class PostReceiveHook extends ReceiveHook
}
}
}
-$this-alreadyExistsBranches = array_diff($this-allBranches,
$newBranches);
//send mails per ref push
+$revisions = [];
+
foreach ($this-refs as $ref) {
if ($ref['reftype'] == self::REF_TAG) {
$this-sendTagMail($ref['refname'], $ref['changetype'],
$ref['old'], $ref['new']);
}
-}
-foreach($this-refs as $ref) {
-// magic populate the $this-revisions
-if ($ref['changetype'] != self::TYPE_DELETED) {
-$this-getBranchRevisions($ref['refname'], $ref['changetype'],
$ref['old'], $ref['new']);
-}
-}
-//send mails per commit
-foreach ($this-revisions as $revision = $branches) {
-// check if it commit was already in other branches
-if (!$this-isRevExistsInBranches($revision,
array_diff($this-allBranches, $branches))) {
-$this-sendCommitMail($revision, $branches);
-}
+$revisions = array_merge(
+$revisions,
+$this-getRevisions(escapeshellarg($ref['old'] . '..' .
$ref['new'])));
}
-}
-/**
- * Send mail about branch.
- * Subject: [git] [branch] %PROJECT%: %STATUS% branch %BRANCH_NAME%
- * Body:
- * Branch %BRANCH_NAME% in %PROJECT% was %STATUS%
- * Date: Thu, 08 Mar 2012 12:39:48 +(current mail date)
- *
- * Link:
http://git.php.net/?p=%PROJECT_PATH%;a=log;h=%SHA_NEW%;hp=%SHA_OLD%
- *
- * --part1--
- * Log:
- *
- * --per commit--
- * Commit: %SHA%
- * Author: %USER% Thu, 08 Mar 2012 12:39:48
+
- * Committer: %USER% Thu, 08 Mar 2012
12:39:48 +
- * Link: http://git.php.net/?p=%PROJECT_PATH%;a=commitdiff;h=%SHA%
- * Shortlog: %COMMIT_SUBJECT%
- * --/per commit--
- *
- * --/part1--
- *
- * @param string $name branch fullname (refs/heads/example)
- * @param int $changeType delete, create or update
- * @param string $oldrev old revision
- * @param string $newrev new revision
- * @return string mail uniq id
- */
-private function sendBranchMail($name, $changeType, $oldrev, $newrev)
-{
-
-$logString = '';
-$status = [self::TYPE_UPDATED = 'update', self::TYPE_CREATED =
'create', self::TYPE_DELETED = 'delete'];
-$shortname = str_replace('refs/heads/', '', $name);
-
-// forced push
-if ($changeType == self::TYPE_UPDATED) {
-$replacedRevisions = $this-getRevisions(escapeshellarg($newrev .
'..' . $oldrev)) ?: false;
-} else {
-$replacedRevisions = false;
-}
-
-if ($changeType != self::TYPE_DELETED) {
-
-$revisions = $this-getBranchRevisions($name, $changeType,
$oldrev, $newrev);
-
-if (count($revisions)) {
-
-$logString = '';
-
-foreach ($revisions as $revision) {
-$commitInfo = $this-getCommitInfo($revision);
-$logString .= 'Commit:' . $revision . \n;
-$logString .= 'Author:' . $commitInfo['author'] . ' '
. $commitInfo['author_email'] . ' ' . $commitInfo['author_date'] .
\n;
-if (($commitInfo['author'] != $commitInfo['committer']) ||
($commitInfo['author_email'] != $commitInfo['committer_email'])) {
-$logString .= 'Committer: ' . $commitInfo['committer']
. ' ' . $commitInfo['committer_email'] . ' ' .
$commitInfo['committer_date'] . \n;
-}
-$logString .= 'Link: http://git.php.net/?p=' .
$this-getRepositoryName() . ;a=commitdiff;h= . $revision . \n;
-$logString .= 'Shortlog: ' . $commitInfo['subject'] .
\n;
-$logString .= \n;
-
-}
-}
+foreach (array_unique($revisions) as $revision) {
+$this-sendCommitMail($revision);
}
-$mail = new \Mail();
-$mail-setSubject($this-emailPrefix . 'push ' .
$this-getRepositoryShortName() . ': ' . $status[$changeType] . ' branch ' .
$shortname);
-
-$message = 'Branch ' . $shortname . ' in '
[PHP-CVS] com karma: Do not include delete revisions: lib/Git/PostReceiveHook.php
Commit:eea11ffc817f2921e766850f803918439edf99ca
Author:David Soria Parra d...@php.net Wed, 21 Mar 2012 19:31:43
+0100
Parents: 0b695d086de59588b192276afa68de38a8e35a88
Branches: master
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=eea11ffc817f2921e766850f803918439edf99ca
Log:
Do not include delete revisions
Changed paths:
M lib/Git/PostReceiveHook.php
Diff:
eea11ffc817f2921e766850f803918439edf99ca
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index 1e18195..bebe0ee 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -86,10 +86,11 @@ class PostReceiveHook extends ReceiveHook
if ($ref['reftype'] == self::REF_TAG) {
$this-sendTagMail($ref['refname'], $ref['changetype'],
$ref['old'], $ref['new']);
}
-
-$revisions = array_merge(
-$revisions,
-$this-getRevisions(escapeshellarg($ref['old'] . '..' .
$ref['new'])));
+if ($ref['retype'] != self::TYPE_DELETED) {
+ $revisions = array_merge(
+ $revisions,
+ $this-getRevisions(escapeshellarg($ref['old'] . '..' .
$ref['new'])));
+ }
}
foreach (array_unique($revisions) as $revision) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com karma: Omit already existing revisions: lib/Git/PostReceiveHook.php
Commit:f3cb335d3b43ec524d9c776d3f4c21fc0067c9cc
Author:David Soria Parra d...@php.net Wed, 21 Mar 2012 19:48:30
+0100
Parents: eea11ffc817f2921e766850f803918439edf99ca
Branches: master
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=f3cb335d3b43ec524d9c776d3f4c21fc0067c9cc
Log:
Omit already existing revisions
Changed paths:
M lib/Git/PostReceiveHook.php
Diff:
f3cb335d3b43ec524d9c776d3f4c21fc0067c9cc
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index bebe0ee..937c283 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -94,7 +94,9 @@ class PostReceiveHook extends ReceiveHook
}
foreach (array_unique($revisions) as $revision) {
-$this-sendCommitMail($revision);
+if (!$this-isRevExistsInBranches($revision, $this-allBranches)) {
+$this-sendCommitMail($revision);
+}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com karma: Typo: lib/Git/PostReceiveHook.php
Commit:a9b8d256908e6a16d2627d2254aed619ad09611b
Author:David Soria Parra d...@php.net Wed, 21 Mar 2012 19:50:39
+0100
Parents: f3cb335d3b43ec524d9c776d3f4c21fc0067c9cc
Branches: master
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=a9b8d256908e6a16d2627d2254aed619ad09611b
Log:
Typo
Changed paths:
M lib/Git/PostReceiveHook.php
Diff:
a9b8d256908e6a16d2627d2254aed619ad09611b
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index 937c283..44e4144 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -86,7 +86,7 @@ class PostReceiveHook extends ReceiveHook
if ($ref['reftype'] == self::REF_TAG) {
$this-sendTagMail($ref['refname'], $ref['changetype'],
$ref['old'], $ref['new']);
}
-if ($ref['retype'] != self::TYPE_DELETED) {
+if ($ref['reftype'] != self::TYPE_DELETED) {
$revisions = array_merge(
$revisions,
$this-getRevisions(escapeshellarg($ref['old'] . '..' .
$ref['new'])));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
