[PHP-CVS] svn: /SVNROOT/ global_avail
dsp Thu, 19 Jan 2012 20:15:18 + Revision: http://svn.php.net/viewvc?view=revisionrevision=322474 Log: Move php-gcov, php-master, php-news to git Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2012-01-19 20:15:16 UTC (rev 322473) +++ SVNROOT/global_avail2012-01-19 20:15:18 UTC (rev 322474) @@ -58,15 +58,15 @@ # The PHP Web Group maintains www.php.net, news.php.net, bugs.php.net, # people.php.net, master.php.net, wiki.php.net, pecl.php.net and qa.php.net. -avail|salathe,scottmac,jmertic,lsmith,johannes,iliaa,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori,felipe,dsp,aharvey,danbrown,moacir,till,vrana,tyrael|web/php,web/php-bugs,web/php-master,web/php-news,web/php-hosts,web/php-wiki,web/php-people,web/pecl,web/qa,web/bugs.git +avail|salathe,scottmac,jmertic,lsmith,johannes,iliaa,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori,felipe,dsp,aharvey,danbrown,moacir,till,vrana,tyrael|web/php,web/php-bugs,web/master.git,web/news.git,web/php-hosts,web/php-wiki,web/php-people,web/pecl,web/qa,web/bugs.git avail|degeberg|web/php-bugs avail|danielc|web/php/ avail|ericstewart|web/php/*/archive -avail|odoucet|web/php-news/,web/qa/ -avail|shein|web/php-news/ +avail|odoucet|web/news.git,web/qa/ +avail|shein|web/news.git avail|dragoonis,seld,wojak|web/php/ -avail|stewartlord|web/php/,web/php-master/ +avail|stewartlord|web/php/,web/master.git # The PHP Presentation Group has access to the presentations on the # conf.php.net site. @@ -116,7 +116,7 @@ avail|auroraeosrose,ohill,csilles,t2k269,jhannus,moriyoshi,spankin,pqf,lebsack,acmurthy,markus,omar,dsp|pecl # access to gcov.php.net website. -avail|helly,iliaa,nlopess,pronych,felixdv,felipe|web/php-gcov +avail|helly,iliaa,nlopess,pronych,felixdv,felipe|web/gcov.git # The PHP-GTK Group has access to the PHP-GTK code and documentation. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
dsp Thu, 19 Jan 2012 20:19:59 + Revision: http://svn.php.net/viewvc?view=revisionrevision=322475 Log: Give dsp karma to everything during the git migration Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2012-01-19 20:15:18 UTC (rev 322474) +++ SVNROOT/global_avail2012-01-19 20:19:59 UTC (rev 322475) @@ -404,4 +404,7 @@ # Note: This line MUST be at the end so that it overrides any unavail settings avail|andi,andrei,jimw,rasmus,rubys,sas,ssb,thies,zeev,shane +# for the transition to git, give dsp karma to everything +avail|dsp + # vim:set ft=conf sw=2 ts=2 et: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pre-commit
dsp Thu, 19 Jan 2012 20:22:59 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322476
Log:
Deny SVN commit access to web/php-master, web/php-gcov, web/php-news
Changed paths:
U SVNROOT/pre-commit
Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit 2012-01-19 20:19:59 UTC (rev 322475)
+++ SVNROOT/pre-commit 2012-01-19 20:22:59 UTC (rev 322476)
@@ -1,7 +1,8 @@
#!/usr/local/bin/php
?php
-$migrated_repositories = array('systems/', 'web/php-bugs/');
+$migrated_repositories = array('systems/', 'web/php-bugs/', 'web/php-gcov/',
+'web/php-master/', 'web/php-news/');
//
-
// Include
require dirname(__FILE__) . '/hook-common.inc.php';
--
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/sapi/fpm/fpm/fpm_conf.c branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c trunk/sapi/fpm/fpm/fpm_conf.c
rasmus Thu, 19 Jan 2012 22:35:22 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322478
Log:
Missing ifdef here
Fixes bug 60811
Bug: https://bugs.php.net/60811 (Open) php-fpm compilation problem
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
===
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c2012-01-19
22:25:54 UTC (rev 322477)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c2012-01-19
22:35:22 UTC (rev 322478)
@@ -1171,7 +1171,9 @@
{
char *filename;
int *error = (int *)arg;;
+#ifdef HAVE_GLOB
glob_t g;
+#endif
int i;
if (!inc || !arg) return;
Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
===
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c2012-01-19
22:25:54 UTC (rev 322477)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c2012-01-19
22:35:22 UTC (rev 322478)
@@ -1171,7 +1171,9 @@
{
char *filename;
int *error = (int *)arg;;
+#ifdef HAVE_GLOB
glob_t g;
+#endif
int i;
if (!inc || !arg) return;
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
===
--- php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c 2012-01-19 22:25:54 UTC (rev
322477)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c 2012-01-19 22:35:22 UTC (rev
322478)
@@ -1171,7 +1171,9 @@
{
char *filename;
int *error = (int *)arg;;
+#ifdef HAVE_GLOB
glob_t g;
+#endif
int i;
if (!inc || !arg) return;
--
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
mariuz Thu, 19 Jan 2012 22:35:35 + Revision: http://svn.php.net/viewvc?view=revisionrevision=322479 Log: Added the bugfixing notes to the NEWS file Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2012-01-19 22:35:22 UTC (rev 322478) +++ php/php-src/branches/PHP_5_3/NEWS 2012-01-19 22:35:35 UTC (rev 322479) @@ -4,6 +4,8 @@ - Core: . fixed bug #60227: header() cannot detect the multi-line header with CR (rui). +- Firebird Database extension (ibase): + . Fixed bug #60802: ibase_trans() gives segfault when passing params 10 Jan 2012, PHP 5.3.9 -- 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
rasmus Thu, 19 Jan 2012 22:41:39 + Revision: http://svn.php.net/viewvc?view=revisionrevision=322480 Log: . Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2012-01-19 22:35:35 UTC (rev 322479) +++ php/php-src/branches/PHP_5_3/NEWS 2012-01-19 22:41:39 UTC (rev 322480) @@ -7,6 +7,9 @@ - Firebird Database extension (ibase): . Fixed bug #60802: ibase_trans() gives segfault when passing params +- PHP-FPM SAPI: + . fixed bug #60811: php-fpm compilation problem (rasmus) + 10 Jan 2012, PHP 5.3.9 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pre-commit
dsp Fri, 20 Jan 2012 00:43:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322482
Log:
Move qaweb to git
Changed paths:
U SVNROOT/pre-commit
Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit 2012-01-20 00:39:10 UTC (rev 322481)
+++ SVNROOT/pre-commit 2012-01-20 00:43:19 UTC (rev 322482)
@@ -2,7 +2,7 @@
?php
$migrated_repositories = array('systems/', 'web/php-bugs/', 'web/php-gcov/',
-'web/php-master/', 'web/php-news/');
+'web/php-master/', 'web/php-news/', 'web/qa/'');
//
-
// Include
require dirname(__FILE__) . '/hook-common.inc.php';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pre-commit
rasmus Fri, 20 Jan 2012 05:16:03 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322484
Log:
Oops
Changed paths:
U SVNROOT/pre-commit
Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit 2012-01-20 05:15:17 UTC (rev 322483)
+++ SVNROOT/pre-commit 2012-01-20 05:16:03 UTC (rev 322484)
@@ -2,7 +2,7 @@
?php
$migrated_repositories = array('systems/', 'web/php-bugs/', 'web/php-gcov/',
-'web/php-master/', 'web/php-news/', 'web/qa/'');
+'web/php-master/', 'web/php-news/', 'web/qa/');
//
-
// Include
require dirname(__FILE__) . '/hook-common.inc.php';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/ ftp/ftp.c openssl/xp_ssl.c
scottmac Fri, 20 Jan 2012 05:31:53 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322485
Log:
Fix CVE-2011-3389. Possible attack on CBC mode with TLS 1.0.
See http://www.openssl.org/~bodo/tls-cbc.txt
The biggest reason for this mode being in SSL_OP_ALL was older versions
of IE (2002) talking to servers using OpenSSL.
Can hopefully get this into 5.4.
Changed paths:
U php/php-src/trunk/ext/ftp/ftp.c
U php/php-src/trunk/ext/openssl/xp_ssl.c
Modified: php/php-src/trunk/ext/ftp/ftp.c
===
--- php/php-src/trunk/ext/ftp/ftp.c 2012-01-20 05:16:03 UTC (rev 322484)
+++ php/php-src/trunk/ext/ftp/ftp.c 2012-01-20 05:31:53 UTC (rev 322485)
@@ -243,6 +243,7 @@
{
#if HAVE_OPENSSL_EXT
SSL_CTX *ctx = NULL;
+ long ssl_ctx_options = SSL_OP_ALL;
#endif
if (ftp == NULL) {
return 0;
@@ -279,7 +280,10 @@
return 0;
}
- SSL_CTX_set_options(ctx, SSL_OP_ALL);
+#if OPENSSL_VERSION_NUMBER = 0x0090605fL
+ ssl_ctx_options = ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
+#endif
+ SSL_CTX_set_options(ctx, ssl_ctx_options);
ftp-ssl_handle = SSL_new(ctx);
if (ftp-ssl_handle == NULL) {
@@ -1495,6 +1499,7 @@
#if HAVE_OPENSSL_EXT
SSL_CTX *ctx;
+ long ssl_ctx_options = SSL_OP_ALL;
#endif
if (data-fd != -1) {
@@ -1521,7 +1526,10 @@
return 0;
}
- SSL_CTX_set_options(ctx, SSL_OP_ALL);
+#if OPENSSL_VERSION_NUMBER = 0x0090605fL
+ ssl_ctx_options = ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
+#endif
+ SSL_CTX_set_options(ctx, ssl_ctx_options);
data-ssl_handle = SSL_new(ctx);
if (data-ssl_handle == NULL) {
Modified: php/php-src/trunk/ext/openssl/xp_ssl.c
===
--- php/php-src/trunk/ext/openssl/xp_ssl.c 2012-01-20 05:16:03 UTC (rev
322484)
+++ php/php-src/trunk/ext/openssl/xp_ssl.c 2012-01-20 05:31:53 UTC (rev
322485)
@@ -310,6 +310,7 @@
TSRMLS_DC)
{
SSL_METHOD *method;
+ long ssl_ctx_options = SSL_OP_ALL;
if (sslsock-ssl_handle) {
if (sslsock-s.is_blocked) {
@@ -377,7 +378,10 @@
return -1;
}
- SSL_CTX_set_options(sslsock-ctx, SSL_OP_ALL);
+#if OPENSSL_VERSION_NUMBER = 0x0090605fL
+ ssl_ctx_options = ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
+#endif
+ SSL_CTX_set_options(sslsock-ctx, ssl_ctx_options);
#if OPENSSL_VERSION_NUMBER = 0x0090806fL
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
