[PHP-CVS] com php-src: PHP 5.3.25: NEWS configure.in main/php_version.h
Commit:ae3a37659f93bb16ca813a39d2cdd0a96a63bea8 Author:Johannes Schlüter johan...@php.net Wed, 8 May 2013 17:58:52 +0200 Parents: 916226b745bab77e60fcf87041ed4f324dfdfa5c Branches: PHP-5.3.25 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ae3a37659f93bb16ca813a39d2cdd0a96a63bea8 Log: PHP 5.3.25 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index b68a43d..1aebab4 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -25 Apr 2013, PHP 5.3.25RC1 +09 May 2013, PHP 5.3.25 - Core: . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: diff --git a/configure.in b/configure.in index 4341a22..7ad93be 100644 --- a/configure.in +++ b/configure.in @@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h) PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=25 -PHP_EXTRA_VERSION=RC1 +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` diff --git a/main/php_version.h b/main/php_version.h index 334fb6e..1096904 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 25 -#define PHP_EXTRA_VERSION RC1 -#define PHP_VERSION 5.3.25RC1 +#define PHP_EXTRA_VERSION +#define PHP_VERSION 5.3.25 #define PHP_VERSION_ID 50325 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] tag php-src: create tag php-5.3.25
Tag php-5.3.25 in php-src.git was created Tag: 4227962d25a44b07fa6f219756db40388bd8231c Tagger: Johannes Schlüterjohan...@php.net Wed May 8 17:59:31 2013 +0200 Log: PHP 5.3.25 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJRinZvAAoJEH3sTmn8nIPXuN0H/3IVmvsBEA+R1zfKa8ClFmy2 QitUqfV71aOPJCIfgSZvePCKPHsUTn0j+TFi/9r7OFPOG0wS0m2n6TYSnIN7P0yn 6kNjIxbXQEpdw2HXKA4lPjJw3BvKA9oQ+C6ct8Cu+fzXUG1Q4X5XGfdINWNIhDb0 eG+wseTUSR08wh0+AoKlFYc6bMS0G75gkd8rqIrYG6M8hKV/u54srzaO8jNScHg8 PHOgsB5MvC/zL4hbDCRhRV5xLZ+RmLRfIp4D0cN0itRbdkkn+BEY2kXUaCNLL5ta KVqyFy0SpPvFrQp9STKPRYPLGxGwAmA9PS1VRXQuij4slZwnm+ICRPceVMealVM= =Yq3D -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=4227962d25a44b07fa6f219756db40388bd8231c Target: ae3a37659f93bb16ca813a39d2cdd0a96a63bea8 Author: Johannes Schlüter johan...@php.net Wed, 8 May 2013 17:58:52 +0200 Parents: 916226b745bab77e60fcf87041ed4f324dfdfa5c Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ae3a37659f93bb16ca813a39d2cdd0a96a63bea8 Target log: PHP 5.3.25 Changed paths: M NEWS M configure.in M main/php_version.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: PHP 5.3.25 NEWS: NEWS
Commit:1cc2162b835ff6bcb8650b9522f54d266576401e Author:Johannes Schlüter johan...@php.net Wed, 8 May 2013 18:01:39 +0200 Parents: 5c701d19aca937e28fca32934719836991b40cf0 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1cc2162b835ff6bcb8650b9522f54d266576401e Log: PHP 5.3.25 NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 2d831ae..809aad9 100644 --- a/NEWS +++ b/NEWS @@ -15,9 +15,7 @@ PHP NEWS . Fixed bug #64770 (stream_select() fails with pipes returned by proc_open() on Windows x64). (Anatol) -?? ??? 2013, PHP 5.3.25 - -### ADD ENTRIES ABOVE FOR 5.3.26. 5.3.25 NEWS WILL BE UPDATED BY RM ON MERGE ### +09 May 2013, PHP 5.3.25 - Core: . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] tag php-src: create tag php-5.5.0RC1
Tag php-5.5.0RC1 in php-src.git was created Tag: cb8c9d68b8017345d3078157eaddb4205b087a09 Tagger: David Soria Parrad...@php.net Wed May 8 18:50:15 2013 +0200 Log: PHP 5.5.0 Release Candidate 1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJRioJNAAoJEME8cLhyZ7Ut1dQQAO8bRLJGKjAlP7tt73Y3/vTi p7z4suj9kLjgJrCPY94gI1cjugRUsYj6DZfTlsBipRqTpoSK4B8phYtkRZeNzN+M pLTUjWVGBGcf12jHZ3PrvXVg7rPKGjofZ71FVW9uJQ6FbeR3sqqCA6KXxKmlqXeA 6owNchFZJpvEYuhLgIrKl7UIyd3UxkQh45SbRKCiSX7WyE+Y4hPibECOQFN+gwxT 2S38rd5QpPCuP7qTN7xGPrUZvHZcbOCOZ2iW1CAWOF4DMpSQNlli3mvqGkWYqbAx fvlCSVJLKmbPg4SEaKuWDiWM57nwelsH6wmedepyqCGN+WzzxXziitjqYo80s532 U3uC8Y64IduFWutYSFe6YJ879EsmkoHmVut3HlCxbCE+/WtssSn/TGgy7F8J44P8 TQOazwXpHZuFcf/BD5CjehOhsz/wMmCdzZ53BYmycpa2xuMGaYRrzlpkOEr+2ZMp 8mXv804qqwIFu12hEfZEjYiKu3egKuePXzjJfHv+hOh3j/cW3QLSrYhXDrHX+5O4 JHt5nBRfC4anJWSvtmXcFaruv/M5dNMZsdmD8k6rfg6RcCbanIDJacrlrS2JTbDl PF4yBJ8V6QJrQVQTpiBcMRTw1Kn14j5zIRxeKAtxs1lDHSEF/FYKnwWqwvAJsyPj AJPnMa9NSVRD8CyxpM8S =Amdb -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=cb8c9d68b8017345d3078157eaddb4205b087a09 Target: da76b1a87356695dfd9ce17c81801c3f8450a647 Author: David Soria Parra d...@php.net Wed, 8 May 2013 18:45:31 +0200 Parents: e30dbcce773cec5fbf5daed74fc171c88ac5c9c9 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=da76b1a87356695dfd9ce17c81801c3f8450a647 Target log: PHP 5.5.0 Release Candidate 1 Changed paths: M configure.in M main/php_version.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: News for RC2: NEWS
Commit:288f04c430b271c416b4cc0a4cef7845927be7b0 Author:David Soria Parra d...@php.net Wed, 8 May 2013 18:57:06 +0200 Parents: e30dbcce773cec5fbf5daed74fc171c88ac5c9c9 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=288f04c430b271c416b4cc0a4cef7845927be7b0 Log: News for RC2 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 32baf77..2a3b917 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ PHPNEWS ||| +?? ??? 2013, PHP 5.5.0 Release Candidate 2 + + 09 May 2013, PHP 5.5.0 Release Candidate 1 - FPM: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: NEWS for RC1: NEWS
Commit:e30dbcce773cec5fbf5daed74fc171c88ac5c9c9 Author:David Soria Parra d...@php.net Wed, 8 May 2013 18:44:05 +0200 Parents: 9ef017af007384215679c30a7ca72ffc9f7effa2 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e30dbcce773cec5fbf5daed74fc171c88ac5c9c9 Log: NEWS for RC1 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 0cb524a..32baf77 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.5.0 Release Candidate 1 +09 May 2013, PHP 5.5.0 Release Candidate 1 - FPM: . Ignore QUERY_STRING when sent in SCRIPT_FILENAME. (Remi) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed news, rc1 is already branched: NEWS
Commit:7b09e5fe35bbb5ae65bbb5fb717e374bb9e9a5bb Author:Anatol Belski a...@php.net Wed, 8 May 2013 19:24:51 +0200 Parents: 4091e946606deaf2f8d909e20701bdb832996074 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7b09e5fe35bbb5ae65bbb5fb717e374bb9e9a5bb Log: Fixed news, rc1 is already branched Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index c0e4d79..192d62d 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ PHP NEWS ||| ?? ??? 2013, PHP 5.5.0 Release Candidate 2 +- mbstring: + . Fixed bug #64769 (mbstring PHPTs crash on Windows x64). (Anatol) + 09 May 2013, PHP 5.5.0 Release Candidate 1 @@ -25,9 +28,6 @@ PHP NEWS . Fixed bug #64770 (stream_select() fails with pipes returned by proc_open() on Windows x64). (Anatol) -- mbstring: - . Fixed bug #64769 (mbstring PHPTs crash on Windows x64). (Anatol) - 25 Apr 2013, PHP 5.5.0 Beta 4 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #64769 mbstring PHPTs crash on Windows x64: NEWS ext/mbstring/oniguruma/oniguruma.h ext/mbstring/oniguruma/st.h
Commit:4091e946606deaf2f8d909e20701bdb832996074
Author:Anatol Belski a...@php.net Wed, 8 May 2013 18:58:32 +0200
Parents: 288f04c430b271c416b4cc0a4cef7845927be7b0
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=4091e946606deaf2f8d909e20701bdb832996074
Log:
Fixed bug #64769 mbstring PHPTs crash on Windows x64
The tricky business going there in oniguruma is saving a pointer
in an int variable, passing that variable into a function and making
it a pointer again. On 64bit windows casting a pointer to a 32 bit
int will truncate that pointer. This kind of things won't work on
Windows x64.
[SNIPPET]
unsigned long ul0[2], ul1, *ul2;
ul0[0] = 42uL;
ul0[0] = 24uL;
ul1 = (unsigned long)ul0;
ul2 = (unsigned long *)ul1;
/* now it's broken, accessing ul2[0] will crash. */
[/SNIPPET]
To make it portable, ULONG_PTR should be used in this case.
In oniguruma this behaviour is to see at least in the following
codepath:
ext/mbstring/oniguruma/enc/unicode.c:10938
ext/mbstring/oniguruma/st.c:308
ext/mbstring/oniguruma/enc/unicode.c:10859
Bugs:
https://bugs.php.net/64769
Changed paths:
M NEWS
M ext/mbstring/oniguruma/oniguruma.h
M ext/mbstring/oniguruma/st.h
Diff:
diff --git a/NEWS b/NEWS
index 2a3b917..c0e4d79 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,9 @@ PHP
NEWS
. Fixed bug #64770 (stream_select() fails with pipes returned by proc_open()
on Windows x64). (Anatol)
+- mbstring:
+ . Fixed bug #64769 (mbstring PHPTs crash on Windows x64). (Anatol)
+
25 Apr 2013, PHP 5.5.0 Beta 4
- Core:
diff --git a/ext/mbstring/oniguruma/oniguruma.h
b/ext/mbstring/oniguruma/oniguruma.h
index 3b55763..bf00e20 100644
--- a/ext/mbstring/oniguruma/oniguruma.h
+++ b/ext/mbstring/oniguruma/oniguruma.h
@@ -96,8 +96,13 @@ extern C {
#define UChar OnigUChar
#endif
-typedef unsigned char OnigUChar;
+#ifdef _WIN32
+# include windows.h
+typedef ULONG_PTR OnigCodePoint;
+#else
typedef unsigned long OnigCodePoint;
+#endif
+typedef unsigned char OnigUChar;
typedef unsigned int OnigCtype;
typedef unsigned int OnigDistance;
diff --git a/ext/mbstring/oniguruma/st.h b/ext/mbstring/oniguruma/st.h
index da65e7f..6f93870 100644
--- a/ext/mbstring/oniguruma/st.h
+++ b/ext/mbstring/oniguruma/st.h
@@ -6,7 +6,12 @@
#define ST_INCLUDED
+#ifdef _WIN32
+# include windows.h
+typedef ULONG_PTR st_data_t;
+#else
typedef unsigned long st_data_t;
+#endif
#define ST_DATA_T_DEFINED
typedef struct st_table st_table;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #64769 mbstring PHPTs crash on Windows x64: NEWS ext/mbstring/oniguruma/oniguruma.h ext/mbstring/oniguruma/st.h
Commit:d2a784baa68ea2f866ebf028064712bd12797a1e
Author:Anatol Belski a...@php.net Wed, 8 May 2013 18:58:32 +0200
Parents: 9ef017af007384215679c30a7ca72ffc9f7effa2
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=d2a784baa68ea2f866ebf028064712bd12797a1e
Log:
Fixed bug #64769 mbstring PHPTs crash on Windows x64
The tricky business going there in oniguruma is saving a pointer
in an int variable, passing that variable into a function and making
it a pointer again. On 64bit windows casting a pointer to a 32 bit
int will truncate that pointer. This kind of things won't work on
Windows x64.
[SNIPPET]
unsigned long ul0[2], ul1, *ul2;
ul0[0] = 42uL;
ul0[0] = 24uL;
ul1 = (unsigned long)ul0;
ul2 = (unsigned long *)ul1;
/* now it's broken, accessing ul2[0] will crash. */
[/SNIPPET]
To make it portable, ULONG_PTR should be used in this case.
In oniguruma this behaviour is to see at least in the following
codepath:
ext/mbstring/oniguruma/enc/unicode.c:10938
ext/mbstring/oniguruma/st.c:308
ext/mbstring/oniguruma/enc/unicode.c:10859
Bugs:
https://bugs.php.net/64769
Changed paths:
M NEWS
M ext/mbstring/oniguruma/oniguruma.h
M ext/mbstring/oniguruma/st.h
Diff:
diff --git a/NEWS b/NEWS
index 0cb524a..eeff8e7 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,9 @@ PHP
NEWS
. Fixed bug #64770 (stream_select() fails with pipes returned by proc_open()
on Windows x64). (Anatol)
+- mbstring:
+ . Fixed bug #64769 (mbstring PHPTs crash on Windows x64). (Anatol)
+
25 Apr 2013, PHP 5.5.0 Beta 4
- Core:
diff --git a/ext/mbstring/oniguruma/oniguruma.h
b/ext/mbstring/oniguruma/oniguruma.h
index 3b55763..bf00e20 100644
--- a/ext/mbstring/oniguruma/oniguruma.h
+++ b/ext/mbstring/oniguruma/oniguruma.h
@@ -96,8 +96,13 @@ extern C {
#define UChar OnigUChar
#endif
-typedef unsigned char OnigUChar;
+#ifdef _WIN32
+# include windows.h
+typedef ULONG_PTR OnigCodePoint;
+#else
typedef unsigned long OnigCodePoint;
+#endif
+typedef unsigned char OnigUChar;
typedef unsigned int OnigCtype;
typedef unsigned int OnigDistance;
diff --git a/ext/mbstring/oniguruma/st.h b/ext/mbstring/oniguruma/st.h
index da65e7f..6f93870 100644
--- a/ext/mbstring/oniguruma/st.h
+++ b/ext/mbstring/oniguruma/st.h
@@ -6,7 +6,12 @@
#define ST_INCLUDED
+#ifdef _WIN32
+# include windows.h
+typedef ULONG_PTR st_data_t;
+#else
typedef unsigned long st_data_t;
+#endif
#define ST_DATA_T_DEFINED
typedef struct st_table st_table;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug #64506: fix build with --disable-ipv6: NEWS ext/sockets/conversions.c ext/sockets/sendrecvmsg.c ext/sockets/sockets.c
Commit:6f3c3862ca5c136bb123c1e60e1f163bb7efcf3f
Author:Gustavo Lopes glo...@nebm.ist.utl.pt Wed, 8 May 2013
19:51:39 +0200
Parents: 288f04c430b271c416b4cc0a4cef7845927be7b0
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=6f3c3862ca5c136bb123c1e60e1f163bb7efcf3f
Log:
Fix bug #64506: fix build with --disable-ipv6
Bugs:
https://bugs.php.net/64506
Changed paths:
M NEWS
M ext/sockets/conversions.c
M ext/sockets/sendrecvmsg.c
M ext/sockets/sockets.c
diff --git a/NEWS b/NEWS
index 2a3b917..67e5196 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,9 @@ PHP
NEWS
(Boris Lytochkin)
. Fixed bug #64159 (Truncated snmpget). (Boris Lytochkin)
+- Sockets:
+ . Fixed bug #64506 (Fails to build with --disable-ipv6). (Gustavo)
+
- Streams:
. Fixed bug #64770 (stream_select() fails with pipes returned by proc_open()
on Windows x64). (Anatol)
@@ -28,7 +31,7 @@ PHP
NEWS
25 Apr 2013, PHP 5.5.0 Beta 4
- Core:
- . Fixed bug #64677 (execution operator `` stealing surrounding arguments).
+ . Fixed bug #64677 (execution operator `` stealing surrounding arguments).
(Laruence)
- CURL:
@@ -47,13 +50,13 @@ PHP
NEWS
(Eric Iversen)
- Streams:
- . Fixed Windows x64 version of stream_socket_pair() and improved error
handling
-(Anatol Belski)
+ . Fixed Windows x64 version of stream_socket_pair() and improved error
+handling. (Anatol Belski)
11 Apr 2013, PHP 5.5.0 Beta 3
- Core:
- . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap:
+ . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap:
segfault). (Laruence)
. Fixed bug #64565 (copy doesn't report failure on partial copy). (Remi)
. Fixed bug #64555 (foreach no longer copies keys if they are interned).
@@ -71,7 +74,7 @@ PHP
NEWS
Kapelushnik, Derick)
- General improvements:
- . Drop support for bison 2.4 when building PHP from GIT source.
+ . Drop support for bison 2.4 when building PHP from GIT source.
(Laruence)
- Fileinfo:
@@ -109,7 +112,7 @@ PHP
NEWS
21 Mar 2013, PHP 5.5.0 Beta 1
- Core:
- . Added Zend Opcache extension and enable building it by default.
+ . Added Zend Opcache extension and enable building it by default.
More details here: https://wiki.php.net/rfc/optimizerplus. (Dmitry)
. Added array_column function which returns a column in a multidimensional
array. https://wiki.php.net/rfc/array_column. (Ben Ramsey)
@@ -217,7 +220,7 @@ PHP
NEWS
. Fixed bug #64264 (SPLFixedArray toArray problem). (Laruence)
. Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS).
(patch by kr...@krizalys.com, Laruence)
- . Fixed bug #64106 (Segfault on SplFixedArray[][x] = y when extended).
+ . Fixed bug #64106 (Segfault on SplFixedArray[][x] = y when extended).
(Nikita Popov)
. Fixed bug #52861 (unset fails with ArrayObject and deep arrays).
(Mike Willbanks)
diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c
index e3ff271..ea1c952 100644
--- a/ext/sockets/conversions.c
+++ b/ext/sockets/conversions.c
@@ -37,7 +37,7 @@ struct _WSAMSG {
DWORDdwFlags; //int msg_flags
}
struct __WSABUF {
- u_long len;//size_t
iov_len (2nd member)
+ u_long len;//size_t
iov_len (2nd member)
char FAR *buf; //void
*iov_base (1st member)
}
struct _WSACMSGHDR {
@@ -593,6 +593,7 @@ static void to_zval_read_sockaddr_in(const char *data, zval
*zv, res_context *ct
{
to_zval_read_aggregation(data, zv, descriptors_sockaddr_in, ctx);
}
+#if HAVE_IPV6
static void from_zval_write_sin6_addr(const zval *zaddr_str, char *addr6,
ser_context *ctx)
{
int res;
@@ -652,6 +653,7 @@ static void to_zval_read_sockaddr_in6(const char *data,
zval *zv, res_context *c
{
to_zval_read_aggregation(data, zv, descriptors_sockaddr_in6, ctx);
}
+#endif /* HAVE_IPV6 */
static void from_zval_write_sun_path(const zval *path, char *sockaddr_un_c,
ser_context *ctx)
{
zvallzval = zval_used_for_init;
@@ -742,6 +744,7 @@ static void from_zval_write_sockaddr_aux(const zval
*container,
}
break;
+#if HAVE_IPV6
case AF_INET6:
if (ctx-sock-type != AF_INET6) {
do_from_zval_err(ctx, the specified
[PHP-CVS] com php-src: Fix bug #64506: fix build with --disable-ipv6: NEWS ext/sockets/conversions.c ext/sockets/sendrecvmsg.c ext/sockets/sockets.c
Commit:8687332e086bc332c99692c099514be7996a2139
Author:Gustavo Lopes glo...@nebm.ist.utl.pt Wed, 8 May 2013
19:51:39 +0200
Parents: 7b09e5fe35bbb5ae65bbb5fb717e374bb9e9a5bb
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=8687332e086bc332c99692c099514be7996a2139
Log:
Fix bug #64506: fix build with --disable-ipv6
Bugs:
https://bugs.php.net/64506
Changed paths:
M NEWS
M ext/sockets/conversions.c
M ext/sockets/sendrecvmsg.c
M ext/sockets/sockets.c
diff --git a/NEWS b/NEWS
index 192d62d..e4f5aa4 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,9 @@ PHP
NEWS
(Boris Lytochkin)
. Fixed bug #64159 (Truncated snmpget). (Boris Lytochkin)
+- Sockets:
+ . Fixed bug #64506 (Fails to build with --disable-ipv6). (Gustavo)
+
- Streams:
. Fixed bug #64770 (stream_select() fails with pipes returned by proc_open()
on Windows x64). (Anatol)
@@ -31,7 +34,7 @@ PHP
NEWS
25 Apr 2013, PHP 5.5.0 Beta 4
- Core:
- . Fixed bug #64677 (execution operator `` stealing surrounding arguments).
+ . Fixed bug #64677 (execution operator `` stealing surrounding arguments).
(Laruence)
- CURL:
@@ -50,13 +53,13 @@ PHP
NEWS
(Eric Iversen)
- Streams:
- . Fixed Windows x64 version of stream_socket_pair() and improved error
handling
-(Anatol Belski)
+ . Fixed Windows x64 version of stream_socket_pair() and improved error
+handling. (Anatol Belski)
11 Apr 2013, PHP 5.5.0 Beta 3
- Core:
- . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap:
+ . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap:
segfault). (Laruence)
. Fixed bug #64565 (copy doesn't report failure on partial copy). (Remi)
. Fixed bug #64555 (foreach no longer copies keys if they are interned).
@@ -74,7 +77,7 @@ PHP
NEWS
Kapelushnik, Derick)
- General improvements:
- . Drop support for bison 2.4 when building PHP from GIT source.
+ . Drop support for bison 2.4 when building PHP from GIT source.
(Laruence)
- Fileinfo:
@@ -112,7 +115,7 @@ PHP
NEWS
21 Mar 2013, PHP 5.5.0 Beta 1
- Core:
- . Added Zend Opcache extension and enable building it by default.
+ . Added Zend Opcache extension and enable building it by default.
More details here: https://wiki.php.net/rfc/optimizerplus. (Dmitry)
. Added array_column function which returns a column in a multidimensional
array. https://wiki.php.net/rfc/array_column. (Ben Ramsey)
@@ -220,7 +223,7 @@ PHP
NEWS
. Fixed bug #64264 (SPLFixedArray toArray problem). (Laruence)
. Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS).
(patch by kr...@krizalys.com, Laruence)
- . Fixed bug #64106 (Segfault on SplFixedArray[][x] = y when extended).
+ . Fixed bug #64106 (Segfault on SplFixedArray[][x] = y when extended).
(Nikita Popov)
. Fixed bug #52861 (unset fails with ArrayObject and deep arrays).
(Mike Willbanks)
diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c
index e3ff271..ea1c952 100644
--- a/ext/sockets/conversions.c
+++ b/ext/sockets/conversions.c
@@ -37,7 +37,7 @@ struct _WSAMSG {
DWORDdwFlags; //int msg_flags
}
struct __WSABUF {
- u_long len;//size_t
iov_len (2nd member)
+ u_long len;//size_t
iov_len (2nd member)
char FAR *buf; //void
*iov_base (1st member)
}
struct _WSACMSGHDR {
@@ -593,6 +593,7 @@ static void to_zval_read_sockaddr_in(const char *data, zval
*zv, res_context *ct
{
to_zval_read_aggregation(data, zv, descriptors_sockaddr_in, ctx);
}
+#if HAVE_IPV6
static void from_zval_write_sin6_addr(const zval *zaddr_str, char *addr6,
ser_context *ctx)
{
int res;
@@ -652,6 +653,7 @@ static void to_zval_read_sockaddr_in6(const char *data,
zval *zv, res_context *c
{
to_zval_read_aggregation(data, zv, descriptors_sockaddr_in6, ctx);
}
+#endif /* HAVE_IPV6 */
static void from_zval_write_sun_path(const zval *path, char *sockaddr_un_c,
ser_context *ctx)
{
zvallzval = zval_used_for_init;
@@ -742,6 +744,7 @@ static void from_zval_write_sockaddr_aux(const zval
*container,
}
break;
+#if HAVE_IPV6
case AF_INET6:
if (ctx-sock-type != AF_INET6) {
do_from_zval_err(ctx, the
[PHP-CVS] com php-src: Fix NEWS (wrong bug # AND wrong section...): NEWS
Commit:98302ee3cc880bca26e26c7377c311002bd2b43e Author:Gustavo Lopes glo...@nebm.ist.utl.pt Wed, 8 May 2013 20:03:43 +0200 Parents: 8687332e086bc332c99692c099514be7996a2139 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=98302ee3cc880bca26e26c7377c311002bd2b43e Log: Fix NEWS (wrong bug # AND wrong section...) It's bug #64508, not #64506. Bugs: https://bugs.php.net/64508 https://bugs.php.net/64506 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index e4f5aa4..7c83bd5 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,9 @@ PHP NEWS - mbstring: . Fixed bug #64769 (mbstring PHPTs crash on Windows x64). (Anatol) +- Sockets: + . Fixed bug #64508 (Fails to build with --disable-ipv6). (Gustavo) + 09 May 2013, PHP 5.5.0 Release Candidate 1 @@ -24,9 +27,6 @@ PHP NEWS (Boris Lytochkin) . Fixed bug #64159 (Truncated snmpget). (Boris Lytochkin) -- Sockets: - . Fixed bug #64506 (Fails to build with --disable-ipv6). (Gustavo) - - Streams: . Fixed bug #64770 (stream_select() fails with pipes returned by proc_open() on Windows x64). (Anatol) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
tyrael Thu, 09 May 2013 05:57:54 + Revision: http://svn.php.net/viewvc?view=revisionrevision=330194 Log: v8js is moved to pecl Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2013-05-08 21:03:53 UTC (rev 330193) +++ SVNROOT/global_avail2013-05-09 05:57:54 UTC (rev 330194) @@ -374,7 +374,7 @@ avail|santiagolizardo|pecl/sdl,phpdoc avail|mignov|pecl/virtualization/libvirt.git,phpdoc avail|gabrielwu84|pecl/php/operator.git,phpdoc -avail|preilly|pecl/v8js,phpdoc +avail|preilly|pecl/languages/v8js.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
