[PHP-CVS] cvs: php-src /sapi/cgi fastcgi.c
mattwil Sun Dec 7 10:54:16 2008 UTC
Modified files:
/php-src/sapi/cgi fastcgi.c
Log:
Fixed bug #46782 (fastcgi.c parse error)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.49&r2=1.50&diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.49 php-src/sapi/cgi/fastcgi.c:1.50
--- php-src/sapi/cgi/fastcgi.c:1.49 Tue Oct 21 03:19:07 2008
+++ php-src/sapi/cgi/fastcgi.c Sun Dec 7 10:54:16 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.49 2008/10/21 03:19:07 lbarnaud Exp $ */
+/* $Id: fastcgi.c,v 1.50 2008/12/07 10:54:16 mattwil Exp $ */
#include "php.h"
#include "fastcgi.h"
@@ -191,8 +191,14 @@
int fcgi_init(void)
{
if (!is_initialized) {
+#ifndef _WIN32
+ sa_t sa;
+ socklen_t len = sizeof(sa);
+#endif
zend_hash_init(&fcgi_mgmt_vars, 0, NULL, fcgi_free_mgmt_var_cb,
1);
fcgi_set_mgmt_var("FCGI_MPXS_CONNS",
sizeof("FCGI_MPXS_CONNS")-1, "0", sizeof("0")-1);
+
+ is_initialized = 1;
#ifdef _WIN32
# if 0
/* TODO: Support for TCP sockets */
@@ -203,8 +209,6 @@
return 0;
}
# endif
- is_initialized = 1;
-
if ((GetStdHandle(STD_OUTPUT_HANDLE) == INVALID_HANDLE_VALUE) &&
(GetStdHandle(STD_ERROR_HANDLE) == INVALID_HANDLE_VALUE) &&
(GetStdHandle(STD_INPUT_HANDLE) != INVALID_HANDLE_VALUE)) {
@@ -231,10 +235,6 @@
return is_fastcgi = 0;
}
#else
- sa_t sa;
- socklen_t len = sizeof(sa);
-
- is_initialized = 1;
errno = 0;
if (getpeername(0, (struct sockaddr *)&sa, &len) != 0 && errno
== ENOTCONN) {
fcgi_setup_signals();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /sapi/cgi fastcgi.c
mattwil Sun Dec 7 10:55:47 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/sapi/cgi fastcgi.c
Log:
MFH: Fixed bug #46782 (fastcgi.c parse error)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1348&r2=1.2027.2.547.2.1349&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1348 php-src/NEWS:1.2027.2.547.2.1349
--- php-src/NEWS:1.2027.2.547.2.1348Thu Dec 4 13:17:28 2008
+++ php-src/NEWSSun Dec 7 10:55:47 2008
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2009, PHP 5.2.8
+- Fixed bug #46782 (fastcgi.c parse error). (Matt)
- Fixed bug #46739 (array returned by curl_getinfo should contain content_type
key).
(Mikko)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.2.32&r2=1.4.2.13.2.33&diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.32
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.33
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.32Tue Oct 21 16:43:59 2008
+++ php-src/sapi/cgi/fastcgi.c Sun Dec 7 10:55:47 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.4.2.13.2.32 2008/10/21 16:43:59 lbarnaud Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.13.2.33 2008/12/07 10:55:47 mattwil Exp $ */
#include "php.h"
#include "fastcgi.h"
@@ -183,8 +183,14 @@
int fcgi_init(void)
{
if (!is_initialized) {
+#ifndef _WIN32
+ sa_t sa;
+ socklen_t len = sizeof(sa);
+#endif
zend_hash_init(&fcgi_mgmt_vars, 0, NULL, fcgi_free_mgmt_var_cb,
1);
fcgi_set_mgmt_var("FCGI_MPXS_CONNS",
sizeof("FCGI_MPXS_CONNS")-1, "0", sizeof("0")-1);
+
+ is_initialized = 1;
#ifdef _WIN32
# if 0
/* TODO: Support for TCP sockets */
@@ -195,8 +201,6 @@
return 0;
}
# endif
- is_initialized = 1;
-
if ((GetStdHandle(STD_OUTPUT_HANDLE) == INVALID_HANDLE_VALUE) &&
(GetStdHandle(STD_ERROR_HANDLE) == INVALID_HANDLE_VALUE) &&
(GetStdHandle(STD_INPUT_HANDLE) != INVALID_HANDLE_VALUE)) {
@@ -223,10 +227,6 @@
return is_fastcgi = 0;
}
#else
- sa_t sa;
- socklen_t len = sizeof(sa);
-
- is_initialized = 1;
errno = 0;
if (getpeername(0, (struct sockaddr *)&sa, &len) != 0 && errno
== ENOTCONN) {
fcgi_setup_signals();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/cgi fastcgi.c
mattwil Sun Dec 7 10:55:17 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cgi fastcgi.c
Log:
MFH: Fixed bug #46782 (fastcgi.c parse error)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.2.28.2.7&r2=1.4.2.13.2.28.2.8&diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.28.2.7
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.28.2.8
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.28.2.7Tue Oct 21 03:19:28 2008
+++ php-src/sapi/cgi/fastcgi.c Sun Dec 7 10:55:16 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.4.2.13.2.28.2.7 2008/10/21 03:19:28 lbarnaud Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.13.2.28.2.8 2008/12/07 10:55:16 mattwil Exp $ */
#include "php.h"
#include "fastcgi.h"
@@ -183,8 +183,14 @@
int fcgi_init(void)
{
if (!is_initialized) {
+#ifndef _WIN32
+ sa_t sa;
+ socklen_t len = sizeof(sa);
+#endif
zend_hash_init(&fcgi_mgmt_vars, 0, NULL, fcgi_free_mgmt_var_cb,
1);
fcgi_set_mgmt_var("FCGI_MPXS_CONNS",
sizeof("FCGI_MPXS_CONNS")-1, "0", sizeof("0")-1);
+
+ is_initialized = 1;
#ifdef _WIN32
# if 0
/* TODO: Support for TCP sockets */
@@ -195,8 +201,6 @@
return 0;
}
# endif
- is_initialized = 1;
-
if ((GetStdHandle(STD_OUTPUT_HANDLE) == INVALID_HANDLE_VALUE) &&
(GetStdHandle(STD_ERROR_HANDLE) == INVALID_HANDLE_VALUE) &&
(GetStdHandle(STD_INPUT_HANDLE) != INVALID_HANDLE_VALUE)) {
@@ -223,10 +227,6 @@
return is_fastcgi = 0;
}
#else
- sa_t sa;
- socklen_t len = sizeof(sa);
-
- is_initialized = 1;
errno = 0;
if (getpeername(0, (struct sockaddr *)&sa, &len) != 0 && errno
== ENOTCONN) {
fcgi_setup_signals();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Sun Dec 7 15:59:57 2008 UTC Modified files: /CVSROOTavail Log: - Give Scott phpweb access. http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1474&r2=1.1475&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1474 CVSROOT/avail:1.1475 --- CVSROOT/avail:1.1474Sun Dec 7 02:15:47 2008 +++ CVSROOT/avail Sun Dec 7 15:59:56 2008 @@ -46,7 +46,7 @@ # The PHP Web Group maintains www.php.net, news.php.net, bugs.php.net, # and master.php.net. -avail|jmertic,lsmith,johannes,ilia,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|phpweb,php-bugs-web,php-master-web,php-news-web,php-hosts-web,php-wiki-web +avail|scottmac,jmertic,lsmith,johannes,ilia,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|phpweb,php-bugs-web,php-master-web,php-news-web,php-hosts-web,php-wiki-web # The PHP Presentation Group has access to the presentations on the # conf.php.net site. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS configure.in /main php_version.h
iliaa Sun Dec 7 19:08:35 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS configure.in /php-src/main php_version.h Log: Move active branch to 5.2.9 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1349&r2=1.2027.2.547.2.1350&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1349 php-src/NEWS:1.2027.2.547.2.1350 --- php-src/NEWS:1.2027.2.547.2.1349Sun Dec 7 10:55:47 2008 +++ php-src/NEWSSun Dec 7 19:08:35 2008 @@ -1,10 +1,13 @@ PHPNEWS ||| -?? ??? 2009, PHP 5.2.8 +?? ??? 2009, PHP 5.2.9 - Fixed bug #46782 (fastcgi.c parse error). (Matt) - Fixed bug #46739 (array returned by curl_getinfo should contain content_type key). (Mikko) +09 Dec 2008, PHP 5.2.8 +- Reverted bug fix #42718 that broke magic_quotes_gpc (Scott) + 04 Dec 2008, PHP 5.2.7 - Upgraded PCRE to version 7.8 (Fixes CVE-2008-2371) (Ilia) - Updated timezone database to version 2008.9. (Derick) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.117&r2=1.579.2.52.2.118&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.117 php-src/configure.in:1.579.2.52.2.118 --- php-src/configure.in:1.579.2.52.2.117 Wed Dec 3 15:57:52 2008 +++ php-src/configure.inSun Dec 7 19:08:35 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.117 2008/12/03 15:57:52 iliaa Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.118 2008/12/07 19:08:35 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 -PHP_RELEASE_VERSION=8 +PHP_RELEASE_VERSION=9 PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.81&r2=1.112.2.37.2.82&diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.81 php-src/main/php_version.h:1.112.2.37.2.82 --- php-src/main/php_version.h:1.112.2.37.2.81 Wed Dec 3 15:57:52 2008 +++ php-src/main/php_version.h Sun Dec 7 19:08:35 2008 @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 -#define PHP_RELEASE_VERSION 8 +#define PHP_RELEASE_VERSION 9 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.2.8-dev" -#define PHP_VERSION_ID 50208 +#define PHP_VERSION "5.2.9-dev" +#define PHP_VERSION_ID 50209 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
iliaa Sun Dec 7 19:18:21 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: 5.2.8 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1350&r2=1.2027.2.547.2.1351&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1350 php-src/NEWS:1.2027.2.547.2.1351 --- php-src/NEWS:1.2027.2.547.2.1350Sun Dec 7 19:08:35 2008 +++ php-src/NEWSSun Dec 7 19:18:20 2008 @@ -5,7 +5,7 @@ - Fixed bug #46739 (array returned by curl_getinfo should contain content_type key). (Mikko) -09 Dec 2008, PHP 5.2.8 +08 Dec 2008, PHP 5.2.8 - Reverted bug fix #42718 that broke magic_quotes_gpc (Scott) 04 Dec 2008, PHP 5.2.7 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS configure.in /main php_version.h
iliaa Sun Dec 7 19:23:26 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS configure.in /php-src/main php_version.h Log: 5.2.8 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1351&r2=1.2027.2.547.2.1352&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1351 php-src/NEWS:1.2027.2.547.2.1352 --- php-src/NEWS:1.2027.2.547.2.1351Sun Dec 7 19:18:20 2008 +++ php-src/NEWSSun Dec 7 19:23:25 2008 @@ -1,10 +1,5 @@ PHPNEWS ||| -?? ??? 2009, PHP 5.2.9 -- Fixed bug #46782 (fastcgi.c parse error). (Matt) -- Fixed bug #46739 (array returned by curl_getinfo should contain content_type key). - (Mikko) - 08 Dec 2008, PHP 5.2.8 - Reverted bug fix #42718 that broke magic_quotes_gpc (Scott) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.118&r2=1.579.2.52.2.119&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.118 php-src/configure.in:1.579.2.52.2.119 --- php-src/configure.in:1.579.2.52.2.118 Sun Dec 7 19:08:35 2008 +++ php-src/configure.inSun Dec 7 19:23:25 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.118 2008/12/07 19:08:35 iliaa Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.119 2008/12/07 19:23:25 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,8 +41,8 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 -PHP_RELEASE_VERSION=9 -PHP_EXTRA_VERSION="-dev" +PHP_RELEASE_VERSION=8 +PHP_EXTRA_VERSION="" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.82&r2=1.112.2.37.2.83&diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.82 php-src/main/php_version.h:1.112.2.37.2.83 --- php-src/main/php_version.h:1.112.2.37.2.82 Sun Dec 7 19:08:35 2008 +++ php-src/main/php_version.h Sun Dec 7 19:23:26 2008 @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 -#define PHP_RELEASE_VERSION 9 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.2.9-dev" -#define PHP_VERSION_ID 50209 +#define PHP_RELEASE_VERSION 8 +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.2.8" +#define PHP_VERSION_ID 50208 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS configure.in /main php_version.h
iliaa Sun Dec 7 19:28:02 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS configure.in /php-src/main php_version.h Log: Back to dev http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1352&r2=1.2027.2.547.2.1353&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1352 php-src/NEWS:1.2027.2.547.2.1353 --- php-src/NEWS:1.2027.2.547.2.1352Sun Dec 7 19:23:25 2008 +++ php-src/NEWSSun Dec 7 19:28:00 2008 @@ -1,5 +1,10 @@ PHPNEWS ||| +?? ??? 2009, PHP 5.2.9 +- Fixed bug #46782 (fastcgi.c parse error). (Matt) +- Fixed bug #46739 (array returned by curl_getinfo should contain content_type key). + (Mikko) + 08 Dec 2008, PHP 5.2.8 - Reverted bug fix #42718 that broke magic_quotes_gpc (Scott) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.119&r2=1.579.2.52.2.120&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.119 php-src/configure.in:1.579.2.52.2.120 --- php-src/configure.in:1.579.2.52.2.119 Sun Dec 7 19:23:25 2008 +++ php-src/configure.inSun Dec 7 19:28:01 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.119 2008/12/07 19:23:25 iliaa Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.120 2008/12/07 19:28:01 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,8 +41,8 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 -PHP_RELEASE_VERSION=8 -PHP_EXTRA_VERSION="" +PHP_RELEASE_VERSION=9 +PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.83&r2=1.112.2.37.2.84&diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.83 php-src/main/php_version.h:1.112.2.37.2.84 --- php-src/main/php_version.h:1.112.2.37.2.83 Sun Dec 7 19:23:26 2008 +++ php-src/main/php_version.h Sun Dec 7 19:28:01 2008 @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 -#define PHP_RELEASE_VERSION 8 -#define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.2.8" -#define PHP_VERSION_ID 50208 +#define PHP_RELEASE_VERSION 9 +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.2.9-dev" +#define PHP_VERSION_ID 50209 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/iconv .cvsignore
tony2001Sun Dec 7 19:33:15 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/iconv .cvsignore Log: fix .cvsignore http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/.cvsignore?r1=1.8&r2=1.8.4.1&diff_format=u Index: php-src/ext/iconv/.cvsignore diff -u php-src/ext/iconv/.cvsignore:1.8 php-src/ext/iconv/.cvsignore:1.8.4.1 --- php-src/ext/iconv/.cvsignore:1.8Wed Dec 15 02:29:40 2004 +++ php-src/ext/iconv/.cvsignoreSun Dec 7 19:33:15 2008 @@ -48,6 +48,7 @@ *.gcda *.gcno php_have_bsd_iconv.h +php_have_ibm_iconv.h php_have_libiconv.h php_php_iconv_h_path.h php_have_glibc_iconv.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar Makefile.frag
helly Sun Dec 7 23:57:40 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar Makefile.frag Log: - MFH When installing phar, make phar a link to phar.phar http://cvs.php.net/viewvc.cgi/php-src/ext/phar/Makefile.frag?r1=1.14.2.6&r2=1.14.2.7&diff_format=u Index: php-src/ext/phar/Makefile.frag diff -u php-src/ext/phar/Makefile.frag:1.14.2.6 php-src/ext/phar/Makefile.frag:1.14.2.7 --- php-src/ext/phar/Makefile.frag:1.14.2.6 Sat Jun 21 18:57:53 2008 +++ php-src/ext/phar/Makefile.frag Sun Dec 7 23:57:40 2008 @@ -43,3 +43,4 @@ install-pharcmd: pharcmd [EMAIL PROTECTED](mkinstalldirs) $(INSTALL_ROOT)$(bindir) $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir) + $(LN_S) $(INSTALL_ROOT)$(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar Makefile.frag
helly Mon Dec 8 00:00:17 2008 UTC Modified files: /php-src/ext/phar Makefile.frag Log: - When installing phar, make phar a link to phar.phar http://cvs.php.net/viewvc.cgi/php-src/ext/phar/Makefile.frag?r1=1.15&r2=1.16&diff_format=u Index: php-src/ext/phar/Makefile.frag diff -u php-src/ext/phar/Makefile.frag:1.15 php-src/ext/phar/Makefile.frag:1.16 --- php-src/ext/phar/Makefile.frag:1.15 Fri Aug 1 13:45:05 2008 +++ php-src/ext/phar/Makefile.frag Mon Dec 8 00:00:16 2008 @@ -43,3 +43,4 @@ install-pharcmd: pharcmd [EMAIL PROTECTED](mkinstalldirs) $(INSTALL_ROOT)$(bindir) $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir) + $(LN_S) $(INSTALL_ROOT)$(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar/phar pharcommand.inc
helly Mon Dec 8 00:15:52 2008 UTC
Modified files:
/php-src/ext/phar/phar pharcommand.inc
Log:
- Only show switch -y if available
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/pharcommand.inc?r1=1.52&r2=1.53&diff_format=u
Index: php-src/ext/phar/phar/pharcommand.inc
diff -u php-src/ext/phar/phar/pharcommand.inc:1.52
php-src/ext/phar/phar/pharcommand.inc:1.53
--- php-src/ext/phar/phar/pharcommand.inc:1.52 Fri Oct 17 01:53:26 2008
+++ php-src/ext/phar/phar/pharcommand.inc Mon Dec 8 00:15:51 2008
@@ -139,7 +139,7 @@
'y' => array(
'typ' => 'privkey',
'val' => NULL,
- 'inf' => 'Private key for OpenSSL signing.',
+ 'inf' => 'Private key for OpenSSL
signing.',
),
);
@@ -157,6 +157,9 @@
$hash_optional = array('SHA-256' => 'SHA256',
'SHA-512' =>
'SHA512',
'OpenSSL' =>
'OpenSSL');
+ if (!in_array('OpenSSL', $hash_avail)) {
+ unset($phar_args['y']);
+ }
foreach($hash_optional as $key => $name) {
if (in_array($key, $hash_avail)) {
@@ -378,7 +381,7 @@
* @param string $arg The phar selection
* @param string $cfg The config option.
* @param string $key The key information.
-* @return string $arg The selected algorithm
+* @return string $arg The private key.
*/
static function cli_arg_typ_privkey($arg, $cfg, $key)
{
@@ -1552,7 +1555,7 @@
$use_ext = extension_loaded('phar');
$version = array(
'PHP Version' => phpversion(),
- 'phar.phar version' => '$Revision: 1.52 $',
+ 'phar.phar version' => '$Revision: 1.53 $',
'Phar EXT version' => $use_ext ? phpversion('phar') :
'Not available',
'Phar API version' => Phar::apiVersion(),
'Phar-based phar archives' => true,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/phar pharcommand.inc
helly Mon Dec 8 00:16:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar/phar pharcommand.inc
Log:
- MFH Only show switch -y if available
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/pharcommand.inc?r1=1.49.2.13&r2=1.49.2.14&diff_format=u
Index: php-src/ext/phar/phar/pharcommand.inc
diff -u php-src/ext/phar/phar/pharcommand.inc:1.49.2.13
php-src/ext/phar/phar/pharcommand.inc:1.49.2.14
--- php-src/ext/phar/phar/pharcommand.inc:1.49.2.13 Fri Oct 17 01:58:20 2008
+++ php-src/ext/phar/phar/pharcommand.inc Mon Dec 8 00:16:05 2008
@@ -139,7 +139,7 @@
'y' => array(
'typ' => 'privkey',
'val' => NULL,
- 'inf' => 'Private key for OpenSSL signing.',
+ 'inf' => 'Private key for OpenSSL
signing.',
),
);
@@ -157,6 +157,9 @@
$hash_optional = array('SHA-256' => 'SHA256',
'SHA-512' =>
'SHA512',
'OpenSSL' =>
'OpenSSL');
+ if (!in_array('OpenSSL', $hash_avail)) {
+ unset($phar_args['y']);
+ }
foreach($hash_optional as $key => $name) {
if (in_array($key, $hash_avail)) {
@@ -378,7 +381,7 @@
* @param string $arg The phar selection
* @param string $cfg The config option.
* @param string $key The key information.
-* @return string $arg The selected algorithm
+* @return string $arg The private key.
*/
static function cli_arg_typ_privkey($arg, $cfg, $key)
{
@@ -1552,7 +1555,7 @@
$use_ext = extension_loaded('phar');
$version = array(
'PHP Version' => phpversion(),
- 'phar.phar version' => '$Revision: 1.49.2.13 $',
+ 'phar.phar version' => '$Revision: 1.49.2.14 $',
'Phar EXT version' => $use_ext ? phpversion('phar') :
'Not available',
'Phar API version' => Phar::apiVersion(),
'Phar-based phar archives' => true,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/openssl xp_ssl.c
scottmacMon Dec 8 02:33:47 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/opensslxp_ssl.c
/php-srcNEWS
Log:
Fix bug #46748, segfault when SSL has more than one error message.
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.22.2.3.2.14&r2=1.22.2.3.2.15&diff_format=u
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.14
php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.15
--- php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.14 Sun Nov 16 23:12:38 2008
+++ php-src/ext/openssl/xp_ssl.cMon Dec 8 02:33:46 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_ssl.c,v 1.22.2.3.2.14 2008/11/16 23:12:38 pajoye Exp $ */
+/* $Id: xp_ssl.c,v 1.22.2.3.2.15 2008/12/08 02:33:46 scottmac Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -152,9 +152,10 @@
ERR_error_string_n(ecode, esbuf, sizeof(esbuf) - 1);
}
code = strlen(esbuf);
- esbuf[code] = '\0';
ebuf = erealloc(ebuf, ebuf_size
+ code + 1);
+ ebuf_size += code;
+
if (wptr == NULL) {
wptr = ebuf;
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1353&r2=1.2027.2.547.2.1354&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1353 php-src/NEWS:1.2027.2.547.2.1354
--- php-src/NEWS:1.2027.2.547.2.1353Sun Dec 7 19:28:00 2008
+++ php-src/NEWSMon Dec 8 02:33:46 2008
@@ -2,6 +2,7 @@
|||
?? ??? 2009, PHP 5.2.9
- Fixed bug #46782 (fastcgi.c parse error). (Matt)
+- Fixed bug #46748 (Segfault when an SSL error has more than one error.)
(Scott)
- Fixed bug #46739 (array returned by curl_getinfo should contain content_type
key).
(Mikko)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c winver.h
stasMon Dec 8 07:32:14 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard winver.h
Modified files:
/php-src/ext/standard info.c
Log:
improve Windows version detection
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.13&r2=1.249.2.10.2.14.2.14&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.13
php-src/ext/standard/info.c:1.249.2.10.2.14.2.14
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.13Tue Oct 21 22:08:37 2008
+++ php-src/ext/standard/info.c Mon Dec 8 07:32:14 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.13 2008/10/21 22:08:37 lbarnaud Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.14 2008/12/08 07:32:14 stas Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -238,6 +238,220 @@
/* }}} */
+#ifdef PHP_WIN32
+/* {{{ */
+typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
+typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
+
+#include "winver.h"
+
+#if _MSC_VER < 1300
+#define OSVERSIONINFOEX php_win_OSVERSIONINFOEX
+#endif
+
+char* php_get_windows_name()
+{
+ OSVERSIONINFOEX osvi;
+ SYSTEM_INFO si;
+ PGNSI pGNSI;
+ PGPI pGPI;
+ BOOL bOsVersionInfoEx;
+ DWORD dwType;
+ char *major = NULL, *sub = NULL, *retval;
+
+ ZeroMemory(&si, sizeof(SYSTEM_INFO));
+ ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
+ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+
+ if (!(bOsVersionInfoEx = GetVersionEx ((OSVERSIONINFO *) &osvi))) {
+ return NULL;
+ }
+
+ pGNSI = (PGNSI) GetProcAddress(GetModuleHandle("kernel32.dll"),
"GetNativeSystemInfo");
+ if(NULL != pGNSI) {
+ pGNSI(&si);
+ } else {
+ GetSystemInfo(&si);
+ }
+
+ if (VER_PLATFORM_WIN32_NT==osvi.dwPlatformId && osvi.dwMajorVersion > 4
) {
+ if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0 )
{
+ if (osvi.wProductType == VER_NT_WORKSTATION) {
+ major = "Windows Vista";
+ } else {
+ major = "Windows Server 2008";
+ }
+
+ pGPI = (PGPI)
GetProcAddress(GetModuleHandle("kernel32.dll"), "GetProductInfo");
+ pGPI(6, 0, 0, 0, &dwType);
+
+ switch (dwType) {
+ case PRODUCT_ULTIMATE:
+ sub = "Ultimate Edition";
+ break;
+ case PRODUCT_HOME_PREMIUM:
+ sub = "Home Premium Edition";
+ break;
+ case PRODUCT_HOME_BASIC:
+ sub = "Home Basic Edition";
+ break;
+ case PRODUCT_ENTERPRISE:
+ sub = "Enterprise Edition";
+ break;
+ case PRODUCT_BUSINESS:
+ sub = "Business Edition";
+ break;
+ case PRODUCT_STARTER:
+ sub = "Starter Edition";
+ break;
+ case PRODUCT_CLUSTER_SERVER:
+ sub = "Cluster Server Edition";
+ break;
+ case PRODUCT_DATACENTER_SERVER:
+ sub = "Datacenter Edition";
+ break;
+ case PRODUCT_DATACENTER_SERVER_CORE:
+ sub = "Datacenter Edition (core
installation)";
+ break;
+ case PRODUCT_ENTERPRISE_SERVER:
+ sub = "Enterprise Edition";
+ break;
+ case PRODUCT_ENTERPRISE_SERVER_CORE:
+ sub = "Enterprise Edition (core
installation)";
+ break;
+ case PRODUCT_ENTERPRISE_SERVER_IA64:
+ sub = "Enterprise Edition for
Itanium-based Systems";
+ break;
+ case PRODUCT_SMALLBUSINESS_SERVER:
+ sub = "Small Business Server";
+ break;
+ case PRODUCT_SMALL
[PHP-CVS] cvs: php-src /ext/standard info.c winver.h
stasMon Dec 8 07:33:41 2008 UTC
Modified files:
/php-src/ext/standard winver.h info.c
Log:
improve windows version detection
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/winver.h?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/winver.h
diff -u /dev/null php-src/ext/standard/winver.h:1.2
--- /dev/null Mon Dec 8 07:33:41 2008
+++ php-src/ext/standard/winver.h Mon Dec 8 07:33:41 2008
@@ -0,0 +1,82 @@
+#ifndef _PHP_WINVER_H
+#define _PHP_WINVER_H
+
+#ifndef SM_SERVERR2
+#define SM_SERVERR2 89
+#endif
+#ifndef VER_SUITE_WH_SERVER
+#define VER_SUITE_WH_SERVER 0x8000
+#endif
+
+#ifndef PRODUCT_ULTIMATE
+#define PRODUCT_UNDEFINED 0x
+#define PRODUCT_ULTIMATE0x0001
+#define PRODUCT_HOME_BASIC 0x0002
+#define PRODUCT_HOME_PREMIUM0x0003
+#define PRODUCT_ENTERPRISE 0x0004
+#define PRODUCT_HOME_BASIC_N0x0005
+#define PRODUCT_BUSINESS0x0006
+#define PRODUCT_STANDARD_SERVER 0x0007
+#define PRODUCT_DATACENTER_SERVER 0x0008
+#define PRODUCT_SMALLBUSINESS_SERVER0x0009
+#define PRODUCT_ENTERPRISE_SERVER 0x000A
+#define PRODUCT_STARTER 0x000B
+#define PRODUCT_DATACENTER_SERVER_CORE 0x000C
+#define PRODUCT_STANDARD_SERVER_CORE0x000D
+#define PRODUCT_ENTERPRISE_SERVER_CORE 0x000E
+#define PRODUCT_ENTERPRISE_SERVER_IA64 0x000F
+#define PRODUCT_BUSINESS_N 0x0010
+#define PRODUCT_WEB_SERVER 0x0011
+#define PRODUCT_CLUSTER_SERVER 0x0012
+#define PRODUCT_HOME_SERVER 0x0013
+#define PRODUCT_STORAGE_EXPRESS_SERVER 0x0014
+#define PRODUCT_STORAGE_STANDARD_SERVER 0x0015
+#define PRODUCT_STORAGE_WORKGROUP_SERVER0x0016
+#define PRODUCT_STORAGE_ENTERPRISE_SERVER 0x0017
+#define PRODUCT_SERVER_FOR_SMALLBUSINESS0x0018
+#define PRODUCT_SMALLBUSINESS_SERVER_PREMIUM0x0019
+#endif
+
+#ifndef VER_NT_WORKSTATION
+#define VER_NT_WORKSTATION 0x001
+#define VER_NT_DOMAIN_CONTROLLER0x002
+#define VER_NT_SERVER 0x003
+#endif
+
+#ifndef VER_SUITE_SMALLBUSINESS
+#define VER_SUITE_SMALLBUSINESS 0x0001
+#define VER_SUITE_ENTERPRISE0x0002
+#define VER_SUITE_BACKOFFICE0x0004
+#define VER_SUITE_COMMUNICATIONS0x0008
+#define VER_SUITE_TERMINAL 0x0010
+#define VER_SUITE_SMALLBUSINESS_RESTRICTED 0x0020
+#define VER_SUITE_EMBEDDEDNT0x0040
+#define VER_SUITE_DATACENTER0x0080
+#define VER_SUITE_SINGLEUSERTS 0x0100
+#define VER_SUITE_PERSONAL 0x0200
+#define VER_SUITE_BLADE 0x0400
+#define VER_SUITE_EMBEDDED_RESTRICTED 0x0800
+#define VER_SUITE_SECURITY_APPLIANCE0x1000
+#define VER_SUITE_STORAGE_SERVER0x2000
+#define VER_SUITE_COMPUTE_SERVER0x4000
+#endif
+
+#ifndef PROCESSOR_ARCHITECTURE_AMD64
+#define PROCESSOR_ARCHITECTURE_AMD649
+#endif
+
+typedef struct _php_win_OSVERSIONINFOEXA {
+DWORD dwOSVersionInfoSize;
+DWORD dwMajorVersion;
+DWORD dwMinorVersion;
+DWORD dwBuildNumber;
+DWORD dwPlatformId;
+CHAR szCSDVersion[128];
+WORD wServicePackMajor;
+WORD wServicePackMinor;
+WORD wSuiteMask;
+BYTE wProductType;
+BYTE wReserved;
+} php_win_OSVERSIONINFOEX;
+
+#endif
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.294&r2=1.295&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.294 php-src/ext/standard/info.c:1.295
--- php-src/ext/standard/info.c:1.294 Tue Oct 21 22:06:48 2008
+++ php-src/ext/standard/info.c Mon Dec 8 07:33:41 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.294 2008/10/21 22:06:48 lbarnaud Exp $ */
+/* $Id: info.c,v 1.295 2008/12/08 07:33:41 stas Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -339,6 +339,220 @@
}
/* }}} */
+#ifdef PHP_WIN32
+/* {{{ */
+typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
+typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
+
+#include "winver.h"
+
+#if _MSC_VER < 1300
+#define OSVERSIONINFOEX php_win_OSVERSIONINFOEX
+#endif
+
+char* php_get_windows_name()
+{
+ OSVERSIONINFOEX osvi;
+ SYSTEM_INFO si;
+ PGNSI pGNSI;
+ PGPI pGPI;
+ BOOL bOsVersionInfoEx;
+ DWORD dwType;
+ char *major = NULL, *sub = NULL, *retval;
+
+ ZeroMemory(&si, sizeof(SYSTEM_INFO));
+ ZeroMemory
