[PHP-CVS] com php-src: RFC 6598 reserved ip range starts at 100.64.0.0: ext/filter/logical_filters.c
Commit:7e9044b6a251f40da1217c3265b83a9caae8bff8
Author:David Soria Parra d...@php.net Wed, 18 Sep 2013 14:26:10
+0200
Parents: 9bfd55cda3bd66b56af84a569fafd8a77cbb3726
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=7e9044b6a251f40da1217c3265b83a9caae8bff8
Log:
RFC 6598 reserved ip range starts at 100.64.0.0
Changed paths:
M ext/filter/logical_filters.c
Diff:
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index 71c5aba..1496488 100644
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -714,7 +714,7 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /*
{{{ */
if (flags FILTER_FLAG_NO_RES_RANGE) {
if (
(ip[0] == 0) ||
- (ip[0] == 100 (ip[1] == 0 || ip[1]
= 127)) ||
+ (ip[0] == 100 (ip[1] = 64 || ip[1]
= 127)) ||
(ip[0] == 128 ip[1] == 0) ||
(ip[0] == 191 ip[1] == 255) ||
(ip[0] == 169 ip[1] == 254) ||
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/filter/logical_filters.c
Commit:2eb566188625162644a186bcb6757f22978c54f9 Author:David Soria Parra d...@php.net Wed, 18 Sep 2013 14:28:57 +0200 Parents: a34b141e08f02c34a100676080dddf7d9be84544 7e9044b6a251f40da1217c3265b83a9caae8bff8 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2eb566188625162644a186bcb6757f22978c54f9 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: RFC 6598 reserved ip range starts at 100.64.0.0 Changed paths: MM ext/filter/logical_filters.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Revert EmptyIterator now implements Countable; fixes bug 60577: NEWS ext/spl/internal/emptyiterator.inc ext/spl/spl_iterators.c ext/spl/tests/bug60577.phpt
Commit:7a24ee13ec74bf3e85970e59dd69db8034ff434c
Author:David Soria Parra d...@php.net Wed, 18 Sep 2013 15:06:19
+0200
Parents: 7e9044b6a251f40da1217c3265b83a9caae8bff8
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=7a24ee13ec74bf3e85970e59dd69db8034ff434c
Log:
Revert EmptyIterator now implements Countable; fixes bug 60577
This reverts commit 8a936e8eb938965b0daaf076c109ec60141e57a7.
Bugs:
https://bugs.php.net/60577
Changed paths:
M NEWS
M ext/spl/internal/emptyiterator.inc
M ext/spl/spl_iterators.c
D ext/spl/tests/bug60577.phpt
Diff:
diff --git a/NEWS b/NEWS
index d8895bd..6d94980 100644
--- a/NEWS
+++ b/NEWS
@@ -15,9 +15,6 @@ PHP
NEWS
. Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain
names).
(Syra)
-- SPL:
- . Fixed bug #60577 (count(new EmptyIterator) returns 1). (Levi Morrison)
-
?? ??? 2013, PHP 5.4.20
- Core:
diff --git a/ext/spl/internal/emptyiterator.inc
b/ext/spl/internal/emptyiterator.inc
index d02b15b..ac80e79 100644
--- a/ext/spl/internal/emptyiterator.inc
+++ b/ext/spl/internal/emptyiterator.inc
@@ -15,7 +15,7 @@
* @version 1.0
* @since PHP 5.1
*/
-class EmptyIterator implements Iterator, Countable
+class EmptyIterator implements Iterator
{
/** No operation.
* @return void
@@ -57,15 +57,6 @@ class EmptyIterator implements Iterator, Countable
{
// nothing to do
}
-
- /**
-* @return int
-*/
- function count()
- {
- return 0;
- }
-
}
-?
+?
\ No newline at end of file
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index ad76258..eb82476 100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -3279,23 +3279,12 @@ SPL_METHOD(EmptyIterator, next)
}
} /* }}} */
-/* {{{ proto int EmptyIterator::count()
- Does nothing */
-SPL_METHOD(EmptyIterator, count)
-{
- if (zend_parse_parameters_none() == FAILURE) {
- return;
- }
- RETURN_LONG(0);
-} /* }}} */
-
static const zend_function_entry spl_funcs_EmptyIterator[] = {
SPL_ME(EmptyIterator, rewind, arginfo_recursive_it_void,
ZEND_ACC_PUBLIC)
SPL_ME(EmptyIterator, valid,arginfo_recursive_it_void,
ZEND_ACC_PUBLIC)
SPL_ME(EmptyIterator, key, arginfo_recursive_it_void,
ZEND_ACC_PUBLIC)
SPL_ME(EmptyIterator, current, arginfo_recursive_it_void,
ZEND_ACC_PUBLIC)
SPL_ME(EmptyIterator, next, arginfo_recursive_it_void,
ZEND_ACC_PUBLIC)
- SPL_ME(EmptyIterator, count,arginfo_recursive_it_void,
ZEND_ACC_PUBLIC)
PHP_FE_END
};
@@ -3767,7 +3756,6 @@ PHP_MINIT_FUNCTION(spl_iterators)
REGISTER_SPL_STD_CLASS_EX(EmptyIterator, NULL, spl_funcs_EmptyIterator);
REGISTER_SPL_ITERATOR(EmptyIterator);
- REGISTER_SPL_IMPLEMENTS(EmptyIterator, Countable);
REGISTER_SPL_SUB_CLASS_EX(RecursiveTreeIterator,
RecursiveIteratorIterator, spl_RecursiveTreeIterator_new,
spl_funcs_RecursiveTreeIterator);
REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, BYPASS_CURRENT,
RTIT_BYPASS_CURRENT);
diff --git a/ext/spl/tests/bug60577.phpt b/ext/spl/tests/bug60577.phpt
deleted file mode 100644
index 33fc133..000
--- a/ext/spl/tests/bug60577.phpt
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-count(new EmptyIterator) should return zero
---FILE--
-?php
-$it = new EmptyIterator;
-var_dump(count($it));
---EXPECT--
-int(0)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/spl/spl_iterators.c
Commit:94e4c4df86719dbdf265b9d7ccfd1db8cfd32fdf Author:David Soria Parra d...@php.net Wed, 18 Sep 2013 15:06:51 +0200 Parents: 2eb566188625162644a186bcb6757f22978c54f9 7a24ee13ec74bf3e85970e59dd69db8034ff434c Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=94e4c4df86719dbdf265b9d7ccfd1db8cfd32fdf Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Revert EmptyIterator now implements Countable; fixes bug 60577 Bugs: https://bugs.php.net/60577 Changed paths: MM ext/spl/spl_iterators.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: NEWS for added reserved ip addresses according to RFC 6598: NEWS
Commit:dfd7d1063a5292b04f6134284337550f4f513749 Author:David Soria Parra d...@php.net Tue, 17 Sep 2013 09:54:58 +0200 Parents: 7c279df6ae29d58502139c07fa51f4373075 Branches: PHP-5.4 PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dfd7d1063a5292b04f6134284337550f4f513749 Log: NEWS for added reserved ip addresses according to RFC 6598 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index b1280b3..d8895bd 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,7 @@ PHP NEWS message). (Boro Sitnikovski) - Filter: + . Add RFC 6598 IPs to reserved addresses. (Sebastian Nohn) . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names). (Syra) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/filter/logical_filters.c
Commit:5e3da04fb033734d2e69542fe835660c0df8dc48 Author:David Soria Parra d...@php.net Tue, 17 Sep 2013 09:55:03 +0200 Parents: 3d6ac70e6652c2c15b180e3f34fdc061e47f68a4 dfd7d1063a5292b04f6134284337550f4f513749 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5e3da04fb033734d2e69542fe835660c0df8dc48 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: NEWS for added reserved ip addresses according to RFC 6598 Add RFC 6598 IPs to reserved addresses Changed paths: MM ext/filter/logical_filters.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Add RFC 6598 IPs to reserved addresses: ext/filter/logical_filters.c ext/filter/tests/018.phpt
Commit:7c279df6ae29d58502139c07fa51f4373075
Author:Sebastian Nohn sebast...@nohn.net Sun, 15 Sep 2013
19:18:20 +0200
Committer: David Soria Parra d...@php.net Tue, 17 Sep 2013 09:52:53 +0200
Parents: 6a0b90da84433ab1b0844a96036f3185d8a29cef
Branches: PHP-5.4 PHP-5.5
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=7c279df6ae29d58502139c07fa51f4373075
Log:
Add RFC 6598 IPs to reserved addresses
(cherry picked from commit b3f5b822e9f83d99d7cb5eed36ba8d307d1408ee)
Changed paths:
M ext/filter/logical_filters.c
M ext/filter/tests/018.phpt
Diff:
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index c8f94a7..71c5aba 100644
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -714,6 +714,7 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /*
{{{ */
if (flags FILTER_FLAG_NO_RES_RANGE) {
if (
(ip[0] == 0) ||
+ (ip[0] == 100 (ip[1] == 0 || ip[1]
= 127)) ||
(ip[0] == 128 ip[1] == 0) ||
(ip[0] == 191 ip[1] == 255) ||
(ip[0] == 169 ip[1] == 254) ||
diff --git a/ext/filter/tests/018.phpt b/ext/filter/tests/018.phpt
index af52b2e..9c73fc3 100644
--- a/ext/filter/tests/018.phpt
+++ b/ext/filter/tests/018.phpt
@@ -15,6 +15,8 @@ var_dump(filter_var(192.168.0.1, FILTER_VALIDATE_IP,
FILTER_FLAG_NO_PRIV_RANGE
var_dump(filter_var(192.0.34.166, FILTER_VALIDATE_IP,
FILTER_FLAG_NO_PRIV_RANGE));
var_dump(filter_var(127.0.0.1, FILTER_VALIDATE_IP,
FILTER_FLAG_NO_RES_RANGE));
var_dump(filter_var(192.0.0.1, FILTER_VALIDATE_IP,
FILTER_FLAG_NO_RES_RANGE));
+var_dump(filter_var(100.0.0.0, FILTER_VALIDATE_IP,
FILTER_FLAG_NO_RES_RANGE));
+var_dump(filter_var(100.127.255.255, FILTER_VALIDATE_IP,
FILTER_FLAG_NO_RES_RANGE));
var_dump(filter_var(192.0.34.166, FILTER_VALIDATE_IP));
var_dump(filter_var(256.1237.123.1, FILTER_VALIDATE_IP));
var_dump(filter_var(255.255.255.255, FILTER_VALIDATE_IP));
@@ -40,6 +42,8 @@ bool(false)
string(12) 192.0.34.166
bool(false)
string(9) 192.0.0.1
+bool(false)
+bool(false)
string(12) 192.0.34.166
bool(false)
string(15) 255.255.255.255
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Bug 64157 Changed error message to make sense: ext/date/lib/parse_date.c ext/date/lib/parse_date.re ext/date/tests/bug64157.phpt
Commit:a475b2c1db3512eabfece71430cb49065f558e40
Author:Boro Sitnikovski bsitnikov...@sugarcrm.com Fri, 13 Sep
2013 02:20:19 +0200
Committer: David Soria Parra d...@php.net Mon, 16 Sep 2013 03:42:49 +0200
Parents: 160cd8d0a7205cacab9800318abb63a540587c4f
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=a475b2c1db3512eabfece71430cb49065f558e40
Log:
Bug 64157
Changed error message to make sense
Bugs:
https://bugs.php.net/64157
Changed paths:
M ext/date/lib/parse_date.c
M ext/date/lib/parse_date.re
A ext/date/tests/bug64157.phpt
Diff:
diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index 2ad4d31..f510a66 100644
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -25036,7 +25036,7 @@ timelib_time *timelib_parse_from_format(char *format,
char *string, int len, tim
TIMELIB_CHECK_NUMBER;
sec = timelib_get_nr_ex((char **) ptr,
2, length);
if (sec == TIMELIB_UNSET || length !=
2) {
- add_pbf_error(s, A two second
minute could not be found, string, begin);
+ add_pbf_error(s, A two digit
second could not be found, string, begin);
} else {
s-time-s = sec;
}
diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
index f874682..df33508 100644
--- a/ext/date/lib/parse_date.re
+++ b/ext/date/lib/parse_date.re
@@ -2043,7 +2043,7 @@ timelib_time *timelib_parse_from_format(char *format,
char *string, int len, tim
TIMELIB_CHECK_NUMBER;
sec = timelib_get_nr_ex((char **) ptr,
2, length);
if (sec == TIMELIB_UNSET || length !=
2) {
- add_pbf_error(s, A two second
minute could not be found, string, begin);
+ add_pbf_error(s, A two digit
second could not be found, string, begin);
} else {
s-time-s = sec;
}
diff --git a/ext/date/tests/bug64157.phpt b/ext/date/tests/bug64157.phpt
new file mode 100644
index 000..fb71495
--- /dev/null
+++ b/ext/date/tests/bug64157.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Test for bug #64157: DateTime::createFromFormat() reports confusing error
message
+--CREDITS--
+Boro Sitnikovski buritom...@yahoo.com
+--INI--
+date.timezone = UTC
+--FILE--
+?php
+DateTime::createFromFormat('s', '0');
+$lastErrors = DateTime::getLastErrors();
+print_r($lastErrors['errors'][0]);
+?
+--EXPECT--
+A two digit second could not be found
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: NEWS for bug #64441: NEWS
Commit:1939d9e3db2fdbc89bf002c7de00cc0623f321b3 Author:David Soria Parra d...@php.net Mon, 16 Sep 2013 05:21:42 +0200 Parents: 18b54a2366dd589959240f8770bbb54be819f6e7 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1939d9e3db2fdbc89bf002c7de00cc0623f321b3 Log: NEWS for bug #64441 Bugs: https://bugs.php.net/64441 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index c7d5e03..67e31d0 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,10 @@ PHP NEWS . Fixed bug #64157 (DateTime::createFromFormat() reports confusing error message). (Boro Sitnikovski) +- Filter: + . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names). +(Syra) + ?? ??? 2013, PHP 5.4.20 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names): ext/filter/logical_filters.c ext/filter/tests/bug64441.phpt
Commit:18b54a2366dd589959240f8770bbb54be819f6e7
Author:Alex Bobrov syr...@gmail.com Sun, 21 Apr 2013 14:32:02
+0700
Committer: David Soria Parra d...@php.net Mon, 16 Sep 2013 05:23:52 +0200
Parents: 8a936e8eb938965b0daaf076c109ec60141e57a7
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=18b54a2366dd589959240f8770bbb54be819f6e7
Log:
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
(cherry picked from commit c149d4ee4be81ecf005eafd43ede06e70aa4c985)
Bugs:
https://bugs.php.net/64441
Changed paths:
M ext/filter/logical_filters.c
A ext/filter/tests/bug64441.phpt
Diff:
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index 58d5870..c8f94a7 100644
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -484,10 +484,6 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL)
/* {{{ */
}
s++;
}
-
- if (*(e - 1) == '.') {
- goto bad_url;
- }
}
if (
diff --git a/ext/filter/tests/bug64441.phpt b/ext/filter/tests/bug64441.phpt
new file mode 100644
index 000..149079e
--- /dev/null
+++ b/ext/filter/tests/bug64441.phpt
@@ -0,0 +1,11 @@
+--TEST--
+bug 64441, FILTER_VALIDATE_URL will invalidate a hostname that ended by dot
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
+--FILE--
+?php
+var_dump(filter_var('http://example.com./', FILTER_VALIDATE_URL));
+var_dump(filter_var('http://example.com/', FILTER_VALIDATE_URL));
+--EXPECT--
+string(20) http://example.com./;
+string(19) http://example.com/;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: News for bugfix #64157: NEWS
Commit:c0afe829e33c5f5690c6967a102148984836d5aa Author:David Soria Parra d...@php.net Mon, 16 Sep 2013 03:48:34 +0200 Parents: a475b2c1db3512eabfece71430cb49065f558e40 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c0afe829e33c5f5690c6967a102148984836d5aa Log: News for bugfix #64157 Bugs: https://bugs.php.net/64157 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index e05b240..c7d5e03 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,10 @@ PHP NEWS . Fixed bug #65633 (built-in server treat some http headers as case-sensitive). (Adam) +- Datetime: + . Fixed bug #64157 (DateTime::createFromFormat() reports confusing error +message). (Boro Sitnikovski) + ?? ??? 2013, PHP 5.4.20 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: EmptyIterator now implements Countable; fixes bug 60577: ext/spl/internal/emptyiterator.inc ext/spl/spl_iterators.c ext/spl/tests/bug60577.phpt
Commit:8a936e8eb938965b0daaf076c109ec60141e57a7
Author:Levi Morrison le...@php.net Thu, 12 Sep 2013 16:03:39 -0600
Committer: David Soria Parra d...@php.net Mon, 16 Sep 2013 04:04:53 +0200
Parents: c0afe829e33c5f5690c6967a102148984836d5aa
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=8a936e8eb938965b0daaf076c109ec60141e57a7
Log:
EmptyIterator now implements Countable; fixes bug 60577
(cherry picked from commit 6398844c86bee08abe4ee3f206ecd86ad0a498f9)
Bugs:
https://bugs.php.net/60577
Changed paths:
M ext/spl/internal/emptyiterator.inc
M ext/spl/spl_iterators.c
A ext/spl/tests/bug60577.phpt
Diff:
diff --git a/ext/spl/internal/emptyiterator.inc
b/ext/spl/internal/emptyiterator.inc
index ac80e79..d02b15b 100644
--- a/ext/spl/internal/emptyiterator.inc
+++ b/ext/spl/internal/emptyiterator.inc
@@ -15,7 +15,7 @@
* @version 1.0
* @since PHP 5.1
*/
-class EmptyIterator implements Iterator
+class EmptyIterator implements Iterator, Countable
{
/** No operation.
* @return void
@@ -57,6 +57,15 @@ class EmptyIterator implements Iterator
{
// nothing to do
}
+
+ /**
+* @return int
+*/
+ function count()
+ {
+ return 0;
+ }
+
}
-?
\ No newline at end of file
+?
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index eb82476..ad76258 100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -3279,12 +3279,23 @@ SPL_METHOD(EmptyIterator, next)
}
} /* }}} */
+/* {{{ proto int EmptyIterator::count()
+ Does nothing */
+SPL_METHOD(EmptyIterator, count)
+{
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
+ RETURN_LONG(0);
+} /* }}} */
+
static const zend_function_entry spl_funcs_EmptyIterator[] = {
SPL_ME(EmptyIterator, rewind, arginfo_recursive_it_void,
ZEND_ACC_PUBLIC)
SPL_ME(EmptyIterator, valid,arginfo_recursive_it_void,
ZEND_ACC_PUBLIC)
SPL_ME(EmptyIterator, key, arginfo_recursive_it_void,
ZEND_ACC_PUBLIC)
SPL_ME(EmptyIterator, current, arginfo_recursive_it_void,
ZEND_ACC_PUBLIC)
SPL_ME(EmptyIterator, next, arginfo_recursive_it_void,
ZEND_ACC_PUBLIC)
+ SPL_ME(EmptyIterator, count,arginfo_recursive_it_void,
ZEND_ACC_PUBLIC)
PHP_FE_END
};
@@ -3756,6 +3767,7 @@ PHP_MINIT_FUNCTION(spl_iterators)
REGISTER_SPL_STD_CLASS_EX(EmptyIterator, NULL, spl_funcs_EmptyIterator);
REGISTER_SPL_ITERATOR(EmptyIterator);
+ REGISTER_SPL_IMPLEMENTS(EmptyIterator, Countable);
REGISTER_SPL_SUB_CLASS_EX(RecursiveTreeIterator,
RecursiveIteratorIterator, spl_RecursiveTreeIterator_new,
spl_funcs_RecursiveTreeIterator);
REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, BYPASS_CURRENT,
RTIT_BYPASS_CURRENT);
diff --git a/ext/spl/tests/bug60577.phpt b/ext/spl/tests/bug60577.phpt
new file mode 100644
index 000..33fc133
--- /dev/null
+++ b/ext/spl/tests/bug60577.phpt
@@ -0,0 +1,8 @@
+--TEST--
+count(new EmptyIterator) should return zero
+--FILE--
+?php
+$it = new EmptyIterator;
+var_dump(count($it));
+--EXPECT--
+int(0)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: NEWS for #60577: NEWS
Commit:6a0b90da84433ab1b0844a96036f3185d8a29cef Author:David Soria Parra d...@php.net Mon, 16 Sep 2013 16:23:29 +0200 Parents: 1939d9e3db2fdbc89bf002c7de00cc0623f321b3 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6a0b90da84433ab1b0844a96036f3185d8a29cef Log: NEWS for #60577 Bugs: https://bugs.php.net/60577 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 67e31d0..b1280b3 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,9 @@ PHP NEWS . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names). (Syra) +- SPL: + . Fixed bug #60577 (count(new EmptyIterator) returns 1). (Levi Morrison) + ?? ??? 2013, PHP 5.4.20 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/date/lib/parse_date.c ext/date/lib/parse_date.re ext/filter/logical_filters.c ext/spl/spl_iterators.c
Commit:3d6ac70e6652c2c15b180e3f34fdc061e47f68a4 Author:David Soria Parra d...@php.net Mon, 16 Sep 2013 23:36:37 +0200 Parents: b5283b9b7abecde841eb268c4b158cd76630d53b 6a0b90da84433ab1b0844a96036f3185d8a29cef Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3d6ac70e6652c2c15b180e3f34fdc061e47f68a4 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: NEWS for #60577 NEWS for bug #64441 Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names) EmptyIterator now implements Countable; fixes bug 60577 News for bugfix #64157 Bug 64157 Changed error message to make sense Bugs: https://bugs.php.net/60577 https://bugs.php.net/64441 https://bugs.php.net/64157 Changed paths: MM ext/date/lib/parse_date.c MM ext/date/lib/parse_date.re MM ext/filter/logical_filters.c MM ext/spl/spl_iterators.c Diff: -- 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.2
Tag php-5.5.2 in php-src.git was created Tag: 06be669a2ec363fec2c35871031a6f2a82ee0f83 Tagger: David Soria Parrad...@php.net Thu Aug 15 22:46:02 2013 +0200 Log: PHP 5.5.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSDT4MAAoJEME8cLhyZ7Ut4uwP/1CqB5AtQXBaU/K8+6qTlqDH jsli6SbRwzwVF2JnHNePE8uzld/R6TuVRTM2rhuDMsHxAV8H2HUN6hk/DOF11lBV QQELUzdvt9B7Ho6eGNE9K0PHHcK+6YtGu92bcj/3ue1dqv65g31J6cj4OBlJ558G Q8EsP3wwz/B3ZjSY2PQOZj/luoNNmi0rkoPrcTip78R2QRzBQg9U91v9ZWnfW9l+ qCYwa1SFTbdNFMUttXwh+YUibJFtMfV4qafefLtfrrwyFrh4KZ3We6lMkvlmRsGh hHq6vGEui8eDMcsBVLYipsd7U4fUomE5ByMk9u9AsM3sx7rMgFqkrOUSAP/gXYFD keXYIaDgg0FYX/PDsJmKDS355bmJGAfqDgLouKXT44LyXOQgI/7CNCn0Xty86pgk J9tEOa0iTKdaCKvKA99Soob1F00WM/MkQ5ITB4mV+07PmdqVlarwwpGXDOM+q5aN 8zgbzHOhf8lLqUa/Z+B0UACYKTGC7su2hbWry7CMxeoLOc7wy+tpuUVUxRRYstHV wF8C8GR8dl9BZe8GhNX0JbZHNRJ9h4qnPBxWvIdTGg9yK07hOth26cRA2QovwEO8 SQY7OrP6/hMJmWQQsGcuDE3PtHKXGbtqmxLUF3SiKO30Xz0N0FOmdT1jJJ9YS8oy T9Xp8smS04C4YmsnrxTC =X7Vm -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=06be669a2ec363fec2c35871031a6f2a82ee0f83 Target: 29b4532f618973b80b6b7017b44139995dce697c Author: David Soria Parra d...@php.net Thu, 15 Aug 2013 22:42:04 +0200 Parents: f12f3abe8e529a1ddfcbcc857f95986b591bce9f Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=29b4532f618973b80b6b7017b44139995dce697c Target log: PHP 5.5.2 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: New news section: NEWS
Commit:e8a4477a4836b552557a483d803e0b1c29224c2a Author:David Soria Parra d...@php.net Thu, 15 Aug 2013 22:41:18 +0200 Parents: f12f3abe8e529a1ddfcbcc857f95986b591bce9f Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e8a4477a4836b552557a483d803e0b1c29224c2a Log: New news section Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 0041bcf..10d97c5 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 2013, PHP 5.5.3 + 15 Aug 2013, PHP 5.5.2 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Prepare news for PHP-5.5.2: NEWS
Commit:f12f3abe8e529a1ddfcbcc857f95986b591bce9f Author:David Soria Parra d...@php.net Thu, 15 Aug 2013 22:40:38 +0200 Parents: 82dd6b94f28a49c4b109d223ebe6b2b5650388e1 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f12f3abe8e529a1ddfcbcc857f95986b591bce9f Log: Prepare news for PHP-5.5.2 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index bc79c14..0041bcf 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.5.3 +15 Aug 2013, PHP 5.5.2 - Core: . Fixed bug #62691 (solaris sed has no -i switch). (Chris Jones) -- 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, 18 Jul 2013 15:43:32 + Revision: http://svn.php.net/viewvc?view=revisionrevision=330973 Log: Give julien karma for distributions Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2013-07-18 15:20:51 UTC (rev 330972) +++ SVNROOT/global_avail2013-07-18 15:43:32 UTC (rev 330973) @@ -69,7 +69,7 @@ avail|stewartlord,danielc,googleguy|web/php.git,web/master.git # The PHP Release Masters publish PHP distributions on php.net/distributions -avail|iliaa,johannes,stas,dsp|web/php-distributions.git +avail|iliaa,johannes,stas,dsp,jpauli|web/php-distributions.git # 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] com php-src: Fix #65108 (is_callable() triggers Fatal Error): NEWS Zend/zend_API.c
Commit:ecd9d7625098bfc0a14ffa1fc39535848e71fc80
Author:David Soria Parra d...@php.net Mon, 24 Jun 2013 15:38:48
+0200
Parents: 9da4985bf2d532ed72fbd3a7d3390464692cce7a
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=ecd9d7625098bfc0a14ffa1fc39535848e71fc80
Log:
Fix #65108 (is_callable() triggers Fatal Error)
We have to check if the fcall info cache contains a pointer if we
use __call, otherwise we endup in a static lookup.
Bugs:
https://bugs.php.net/65108
Changed paths:
M NEWS
M Zend/zend_API.c
Diff:
diff --git a/NEWS b/NEWS
index 2df33bc..0a57834 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ PHP
NEWS
- Core:
. Fixed bug #65088 (Generated configure script is malformed on OpenBSD).
(Adam)
+ . Fixed bug #65108 (is_callable() triggers Fatal Error). (David Soria Parra)
OPcache
. OPcache must be compatible with LiteSpeed SAPI (Dmitry)
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 56c7c24..439d809 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2842,7 +2842,7 @@ static int zend_is_callable_check_func(int check_flags,
zval *callable, zend_fca
}
if ((check_flags IS_CALLABLE_CHECK_NO_ACCESS) == 0
(fcc-calling_scope
-(fcc-calling_scope-__call ||
+((fcc-calling_scope-__call fcc-object_ptr) ||
fcc-calling_scope-__callstatic))) {
if (fcc-function_handler-op_array.fn_flags
ZEND_ACC_PRIVATE) {
if (!zend_check_private(fcc-function_handler,
fcc-object_ptr ? Z_OBJCE_P(fcc-object_ptr) : EG(scope), lmname, mlen
TSRMLS_CC)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Notify doc team BEFORE we release: README.RELEASE_PROCESS
Commit:0ddfafe489cedc71f2198db0d1df062277fdc385 Author:David Soria Parra d...@php.net Mon, 24 Jun 2013 17:44:00 +0200 Parents: ecd9d7625098bfc0a14ffa1fc39535848e71fc80 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0ddfafe489cedc71f2198db0d1df062277fdc385 Log: Notify doc team BEFORE we release Changed paths: M README.RELEASE_PROCESS Diff: diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS index 58d3cd4..06f4724 100644 --- a/README.RELEASE_PROCESS +++ b/README.RELEASE_PROCESS @@ -78,6 +78,9 @@ f.e. http://downloads.php.net/derick/ (internals-...@lists.php.net) so that Windows binaries can be created. Once those are made, they should be placed into the same directory as the source snapshots. +12. Notify the documentation team if documentations for new features are +not yet available but a stable release is imminent. + Getting the non stable release (alpha/beta/RC) announced @@ -174,6 +177,9 @@ those are made, they should be committed to SVN too. 15. When making a final release, also remind the PHP Windows development team (internals-...@lists.php.net) to prepare the installer packages for Win32. +16. Make sure proper documentation exists for all new features/changes. +Coordinate the release with the PHP Documentation team. + Getting the stable release announced -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Update credits: ext/standard/credits_ext.h
Commit:c1b8fbc1127a7a6d6cda1bb4d12f0645dcbecea4 Author:David Soria Parra d...@php.net Wed, 19 Jun 2013 22:03:02 +0200 Parents: 8547628fec43c53fe964847a3ec2bb69d393a4c3 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c1b8fbc1127a7a6d6cda1bb4d12f0645dcbecea4 Log: Update credits Changed paths: M ext/standard/credits_ext.h Diff: diff --git a/ext/standard/credits_ext.h b/ext/standard/credits_ext.h index 382e70e..2770d16 100644 --- a/ext/standard/credits_ext.h +++ b/ext/standard/credits_ext.h @@ -42,8 +42,8 @@ CREDIT_LINE(MS SQL, Frank M. Kromann); CREDIT_LINE(Multibyte String Functions, Tsukada Takuya, Rui Hirokawa); CREDIT_LINE(MySQL driver for PDO, George Schlossnagle, Wez Furlong, Ilia Alshanetsky, Johannes Schlueter); CREDIT_LINE(MySQLi, Zak Greant, Georg Richter, Andrey Hristov, Ulf Wendel); -CREDIT_LINE(MySQLnd, Andrey Hristov, Ulf Wendel, Georg Richter); -CREDIT_LINE(MySQL, Zeev Suraski, Zak Greant, Georg Richter); +CREDIT_LINE(MySQLnd, Andrey Hristov, Ulf Wendel, Georg Richter, Johannes Schlueter); +CREDIT_LINE(MySQL, Zeev Suraski, Zak Greant, Georg Richter, Andrey Hristov); CREDIT_LINE(OCI8, Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson, Maxim Maletsky, Harald Radi, Antony Dovgal, Andi Gutmans, Wez Furlong, Christopher Jones, Oracle Corporation); CREDIT_LINE(ODBC driver for PDO, Wez Furlong); CREDIT_LINE(ODBC, Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel R. Kalowsky); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Bump version: configure.in main/php_version.h
Commit:83fc53acb9e8056ec3a6d9f97cf0c911944dcfe7 Author:David Soria Parra d...@php.net Wed, 19 Jun 2013 22:11:52 +0200 Parents: c1b8fbc1127a7a6d6cda1bb4d12f0645dcbecea4 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=83fc53acb9e8056ec3a6d9f97cf0c911944dcfe7 Log: Bump version Changed paths: M configure.in M main/php_version.h Diff: diff --git a/configure.in b/configure.in index f531beb..f3a2622 100644 --- a/configure.in +++ b/configure.in @@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=5 -PHP_RELEASE_VERSION=0 +PHP_RELEASE_VERSION=1 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` diff --git a/main/php_version.h b/main/php_version.h index 1995834..d4d4fe0 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 5 -#define PHP_RELEASE_VERSION 0 +#define PHP_RELEASE_VERSION 1 #define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.5.0-dev -#define PHP_VERSION_ID 50500 +#define PHP_VERSION 5.5.1-dev +#define PHP_VERSION_ID 50501 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge NEWS from PHP 5.4 branch: NEWS
Commit:8547628fec43c53fe964847a3ec2bb69d393a4c3 Author:David Soria Parra d...@php.net Wed, 19 Jun 2013 21:54:34 +0200 Parents: 2bac1ff137b0186d79ac7db6d2a60e496f7953bb Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8547628fec43c53fe964847a3ec2bb69d393a4c3 Log: Merge NEWS from PHP 5.4 branch Changed paths: M NEWS Diff: Diff exceeded maximum size -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Reorder NEWS for PHP 5.5.0 final: NEWS
Commit:2bac1ff137b0186d79ac7db6d2a60e496f7953bb Author:David Soria Parra d...@php.net Wed, 19 Jun 2013 21:50:05 +0200 Parents: 0a6ec7a2c96589a6a7922137907173f3640c3e9c Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2bac1ff137b0186d79ac7db6d2a60e496f7953bb Log: Reorder NEWS for PHP 5.5.0 final Changed paths: M NEWS diff --git a/NEWS b/NEWS index ffb73a5..5d64b84 100644 --- a/NEWS +++ b/NEWS @@ -1,195 +1,81 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.5.0 Release Candidate 4 +20 Jun 2013, PHP 5.5.0 - Core: + . Added Zend Opcache extension and enable building it by default. +More details here: https://wiki.php.net/rfc/optimizerplus. (Dmitry) + . Added generators and coroutines (https://wiki.php.net/rfc/generators). +(Nikita Popov) + . Added finally keyword (https://wiki.php.net/rfc/finally). (Laruence) + . Added simplified password hashing API +(https://wiki.php.net/rfc/password_hash). (Anthony Ferrara) + . Added support for constant array/string dereferencing. (Laruence) + . Added array_column function which returns a column in a multidimensional +array. https://wiki.php.net/rfc/array_column. (Ben Ramsey) + . Added boolval(). (Jille Timmermans) + . Added Z option to pack/unpack. (Gustavo) + . Added Generator::throw() method. (Nikita Popov) + . Added Class Name Resolution As Scalar Via class Keyword. +(Ralph Schindler, Nikita Popov, Lars) + . Added optional second argument for assert() to specify custom message. Patch +by Lonny Kapelushnik (lo...@lonnylot.com). (Lars) + . Added support for using empty() on the result of function calls and +other expressions (https://wiki.php.net/rfc/empty_isset_exprs). +(Nikita Popov) + . Added support for non-scalar Iterator keys in foreach +(https://wiki.php.net/rfc/foreach-non-scalar-keys). (Nikita Popov) + . Added support for list in foreach (https://wiki.php.net/rfc/foreachlist). +(Laruence) + . Added support for changing the process's title in CLI/CLI-Server SAPIs. +The implementation is more robust that the proctitle PECL module. More +details here: https://wiki.php.net/rfc/cli_process_title. (Keyur) + . Added ARMv7/v8 versions of various Zend arithmetic functions that are +implemented using inline assembler (Ard Biesheuvel) + . Added systemtap support by enabling systemtap compatible dtrace probes on +linux. (David Soria Parra) + . Optimized access to temporary and compiled VM variables. 8% less memory +reads. (Dmitry) + . The VM stacks for passing function arguments and syntaticaly nested calls +were merged into a single stack. The stack size needed for op_array +execution is calculated at compile time and preallocated at once. As result +all the stack push operatins don't require checks for stack overflow +any more. (Dmitry) + . Improve set_exception_handler while doing reset. (Laruence) + . Return previous handler when passing NULL to set_error_handler and +set_exception_handler. (Nikita Popov) + . Remove php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid(), +zend_logo_guid(). (Adnrew Faulds) + . Drop Windows XP and 2003 support. (Pierre) + . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell) + . Implemented FR #60738 (Allow 'set_error_handler' to handle NULL). +(Laruence, Nikita Popov) + . Implemented FR #60524 (specify temp dir by php.ini). (ALeX Kazik). + . Implemented FR #46487 (Dereferencing process-handles no longer waits on +those processes). (Jille Timmermans) + . Fixed bug #65051 (count() off by one inside unset()). (Nikita) . Fixed bug #64988 (Class loading order affects E_STRICT warning). (Laruence) . Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC). (Laruence) + . Fixed bug #64960 (Segfault in gc_zval_possible_root). (Laruence) . Fixed bug #64936 (doc comments picked up from previous scanner run). (Stas, Jonathan Oddy) . Fixed bug #64934 (Apache2 TS crash with get_browser()). (Anatol) - . Fixed bug #64166 (quoted-printable-encode stream filter incorrectly -discarding whitespace). (Michael M Slusarz) - . Fixed bug #65051 (count() off by one inside unset()). (Nikita) - -- FPM: - . Implemented FR #64764 (add support for FPM init.d script). (Lior Kaplan) - -- PDO: - . Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to -the same db server). (Laruence) - -- PDO_mysql: - . Fixed bug #48724 (getColumnMeta() doesn't return native_type for BIT, -TINYINT and YEAR). (Antony, Daniel Beardsley) - -- Readline: - . Implement FR #55694 (Expose additional readline variable to prevent -default filename completion). (Hartmel) - -- SPL: - . Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on -64-bits systems). (Laruence
[PHP-CVS] tag php-src: create tag php-5.5.0
Tag php-5.5.0 in php-src.git was created Tag: 2d8b190d9b63187d38b5b4115c3986d0b8b5e007 Tagger: David Soria Parrad...@php.net Wed Jun 19 22:09:03 2013 +0200 Log: PHP 5.5.0 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJRwg/jAAoJEME8cLhyZ7UtupQP/jWK8RvRsiRECFdJ+752N8YT Pr6PjXq+ompDjqwXT5s4a9D04Xmpz9e4k8AQk0aaJzdLVe3fA8byU9nw2QWvW5/X 4xbiFqZUJveZe3zumgRN9bZbIm4EFPrzHGp9GYAGcCetVp+uIZGb8zvq1ra+wfAw NuEqUkWyS3wf3jQVSeH1LVulFb0RmTVQ5lfh3+1KQq+xNIAUF/F6P4aSaDjfoKRw /QzC1vjpxBpsagc2/qqczIM0u+Oj+md9wpkBwQBPmNC5lmJDi0o6VzCKKWPKQPcB HDlqjoIq07TuVakTiNn3pzbLbZfz0e9R/dyeuWEDC7Ca+1vJh/Wv8azP5UdjBYzs hSMopKOwyjbYRPS/LKVe/YtYMQnetqmthgSQ/9fJsr+tZ8daUHhxH+OEHA9zr1Vp Z8BzUnndPW21kXGwn4eXGq95rD7yW5kQArFslSaDKjNWt7VYtbYku+nypQ+EEhye iXrhBOmJsSLytiYYk+uI/CKm2F9r5Q1ikUouqlHt8J47ui0a3FIg2Y3AnhtUkdVY Cy0KjWjz+fX+orjApY5JnRCFtGDOFaeCPeQ49w58euJtjasC/5HBO6/smOHXMpvj cebSMqO1ZuXyd9NHV+IaRGJTE1zcKqTOfNxZC/cJ7ow8U7dgzWYnMa+LJDMpO77T 5+P8xGCZ72Is5R26sApp =2tB3 -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=2d8b190d9b63187d38b5b4115c3986d0b8b5e007 Target: 4ed24e1e18a5546aa68b641cb8081233ec27ebd4 Author: David Soria Parra d...@php.net Wed, 19 Jun 2013 22:00:41 +0200 Parents: c1b8fbc1127a7a6d6cda1bb4d12f0645dcbecea4 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4ed24e1e18a5546aa68b641cb8081233ec27ebd4 Target log: PHP 5.5.0 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] tag php-src: create tag php-5.5.0RC3
Tag php-5.5.0RC3 in php-src.git was created Tag: 83958f905d98d73c7e1e7ae85199e2b4b08f2471 Tagger: David Soria Parrad...@php.net Wed Jun 5 23:08:05 2013 +0200 Log: PHP 5.5.0 Relesae Canadidate 3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJRr6i9AAoJEME8cLhyZ7UtiOoP/3v2JzdOX5Q1Ruph5G697fGH ZiBN96VlWvkw2JqvU0nIajf3X0pjjBug9AVISl1uvrR/nV/jSbbwY8N/B2PRFAfw kSNglHSz08rSTXdk7ndW6mRzkguaUj4bGjC7pKZnJ93zzu/1SgKfTjVh+JPNQeRx sVIRir+ErLiqL5AI7Yp8qH9Im7H4xH5LG0lZpmWt6AS+VRjLqJcqJ8ki8Un2MDgX VV9ttL4GRFuLrIgcnE0speTlb5D80LLtB40wMRcS966quGI5wL+9I7bvt25BIHw8 e3AX3SlUxvXPQIuva5J1W0daJXwW3kNBWxevilYJedHC/l414T0m+9AeKX3LiB1Y kTp9FrMwYvMCIkzQzAZ65dFeju8LG6MlvWdCSQdfCvszG22bQ9hTb8Zr6dKUKg1R rWwc0fLdohiLS+pLKVuexb7r28vr7w8A1oVcTzawUVGcynINkEhOvbU5lfBKgBVq P9UsCnQ5zayeDAuSEjxLkcauGQkF5fPrCbhk4DMSKODyYJJ8SxhG3pxDjmrbPQpu Ab78hoVsddqmxQ6FfWPSM33sWs/DggWYqOfM8EU85UFYKmfmMB5oRzRFbpK8GGND U2jfPStyJjhwJs77fXILVeNeRwByMcbxShWxSdiy4Zf1J+7gQ1cZIyY7glbx74Mv J7Tgv/QIuAwDctxtnK9S =5NVn -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=83958f905d98d73c7e1e7ae85199e2b4b08f2471 Target: ed806fd89cf430c778d275514a53c5aff11646f0 Author: David Soria Parra d...@php.net Wed, 5 Jun 2013 23:07:40 +0200 Parents: aef5295756ee3dc8000faefca9b747e38be9 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ed806fd89cf430c778d275514a53c5aff11646f0 Target log: PHP 5.5.0RC3 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 update: NEWS
Commit:c649186c3160cece3a410f7cf4df85a502821e7b Author:David Soria Parra d...@php.net Wed, 5 Jun 2013 23:08:48 +0200 Parents: aef5295756ee3dc8000faefca9b747e38be9 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c649186c3160cece3a410f7cf4df85a502821e7b Log: News update Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 75f26b4..430f826 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 2013, PHP 5.5.0 Release Candidate 4 + 06 Jun 2013, PHP 5.5.0 Release Candidate 3 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: PHP 5.5.0RC3 NEWS: NEWS
Commit:aef5295756ee3dc8000faefca9b747e38be9 Author:David Soria Parra d...@php.net Wed, 5 Jun 2013 23:06:51 +0200 Parents: fdeefc466e020e0c3e1d3b585d913f3a88712053 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aef5295756ee3dc8000faefca9b747e38be9 Log: PHP 5.5.0RC3 NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 7e6fcc3..75f26b4 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.5.0 Release Candidate 3 +06 Jun 2013, PHP 5.5.0 Release Candidate 3 - Core: . Fixed bug #64960 (Segfault in gc_zval_possible_root). (Laruence) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: News for upcoming RC3 if necessary: NEWS
Commit:2df1067036dc8627b8cd4820c6b8a4c403a94de5 Author:David Soria Parra d...@php.net Thu, 23 May 2013 00:44:42 +0200 Parents: aa5f19cffb462101450c6958e49d763d6bb4c231 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2df1067036dc8627b8cd4820c6b8a4c403a94de5 Log: News for upcoming RC3 if necessary Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 543044f..98967eb 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 2013, PHP 5.5.0 Release Candidate 3 + 23 May 2013, PHP 5.5.0 Release Candidate 2 - Core: -- 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:aa5f19cffb462101450c6958e49d763d6bb4c231 Author:David Soria Parra d...@php.net Thu, 23 May 2013 00:44:08 +0200 Parents: 4fe74f14c437faa845aa03021535d45732e6f89e Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aa5f19cffb462101450c6958e49d763d6bb4c231 Log: News for RC2 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index f82e557..543044f 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.5.0 Release Candidate 2 +23 May 2013, PHP 5.5.0 Release Candidate 2 - Core: . Fixed bug #64660 (Segfault on memory exhaustion within function definition). -- 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.0RC2
Tag php-5.5.0RC2 in php-src.git was created Tag: e2682746db4bcb8775d1bfbb162a528dceda1582 Tagger: David Soria Parrad...@php.net Thu May 23 00:45:45 2013 +0200 Log: PHP 5.5.0 RC2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJRnUqbAAoJEME8cLhyZ7UtD3gQAMsUlG9lZ+hh0IafYRTfaz85 75GcPYq46QGn04GoH/pYkwdXHX9j6hJtKZ9lrng7/Lmh3vSvWsH3ErsvR3WArtBg IcYSo/7j5U80CHTLEI+t2L4jj3N1zTSPfB9ZzOEATOnFV25iRprwKvqMl2BDRy2U PqgfnP5EowpTIhiEr6UduA0M1ec2zNxKRgmocNKKLcFrw/kCTHfRG/dALiYYZuVR 4C6+7TFxOioMK8+QqLScRH5IKAQygWGrhxx3v51UUWNdujAd7j/ubYzVKrl4Gk9F Gu6xCUT0S4PnV8OcKOYGuvSs+dNcxHFAbhBhXvIMDR48cRR/n77kZbvvze+a8UX0 ZKSTbR7QhG8KNhLoArBmdd1H3kn/ph1oMAMDMMWybgcxGGpZrITMzgwdJ1AjTcmL 1yY3JDLMGObvdmV/pO8U0Sgpns2OwpZKOhJoH7Qg8JOYEFHn87AYtDekvkDadXii sAdBaGSDTE/UHW5LuhqH2n6ObiLPWbsjqi6EHV9J/4ON9/bc4teuYGTlrzwiSovb +nWl8L/nTGcrIziWHkvBGhShaU/kWOaHrpXA9YDvbqUQeXjqqEqRT7cDUcrumleO fn5kHoFnHrkhYY2/oWuL3FJvOUnti1tB7ak/eUr5T6uJcRWPQEDl8cCIrPF3+1Wz jo4TLjxVtH2t0E7nSyUE =RBPk -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=e2682746db4bcb8775d1bfbb162a528dceda1582 Target: 54ffe6a3b77c34e1352611243b9347c9411e4014 Author: David Soria Parra d...@php.net Thu, 23 May 2013 00:45:27 +0200 Parents: aa5f19cffb462101450c6958e49d763d6bb4c231 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=54ffe6a3b77c34e1352611243b9347c9411e4014 Target log: PHP 5.5.0 RC2 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: Fix array_colum segfault: ext/standard/array.c
Commit:139e9824adfa52c68ac45a0d8886f50ae50c0164
Author:David Soria Parra d...@php.net Wed, 15 May 2013 14:27:59
+0200
Parents: 082ee90b9bc9b6487b36831f34acfc901c671c41
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=139e9824adfa52c68ac45a0d8886f50ae50c0164
Log:
Fix array_colum segfault
Separate zval to avoid gc from freeing
Changed paths:
M ext/standard/array.c
Diff:
diff --git a/ext/standard/array.c b/ext/standard/array.c
index cfe9be8..9bfb088 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2608,11 +2608,9 @@ PHP_FUNCTION(array_column)
} else if (zkeyval Z_TYPE_PP(zkeyval) == IS_LONG) {
add_index_zval(return_value, Z_LVAL_PP(zkeyval),
*zcolval);
} else if (zkeyval Z_TYPE_PP(zkeyval) == IS_OBJECT) {
- zval copyval;
- ZVAL_ZVAL(copyval, *zkeyval, 1, 0);
- convert_to_string(copyval);
- add_assoc_zval(return_value, Z_STRVAL(copyval),
*zcolval);
- zval_dtor(copyval);
+ SEPARATE_ZVAL(zkeyval);
+ convert_to_string(*zkeyval);
+ add_assoc_zval(return_value, Z_STRVAL_PP(zkeyval),
*zcolval);
} else {
add_next_index_zval(return_value, *zcolval);
}
--
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: Revert Fix conversion from unsigned char to char: sapi/cgi/cgi_main.c
Commit:86685aefabb70a3c24d1aedd8551019ebf24ed3b
Author:David Soria Parra d...@php.net Mon, 29 Apr 2013 02:26:55
+0200
Parents: 983438a46385710fc3e1314fb7a956da09b6
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=86685aefabb70a3c24d1aedd8551019ebf24ed3b
Log:
Revert Fix conversion from unsigned char to char
This reverts commit bc50ba4bf971c62a1ff5b915a0c9f890b04c1087.
Changed paths:
M sapi/cgi/cgi_main.c
Diff:
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index abe5e6b..9e6b74a 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1818,7 +1818,7 @@ int main(int argc, char *argv[])
if((query_string = getenv(QUERY_STRING)) != NULL
strchr(query_string, '=') == NULL) {
/* we've got query string that has no = - apache CGI will pass
it to command line */
- char *p;
+ unsigned char *p;
decoded_query_string = strdup(query_string);
php_url_decode(decoded_query_string,
strlen(decoded_query_string));
for (p = decoded_query_string; *p *p = ' '; p++) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fix conversion from unsigned char to char: sapi/cgi/cgi_main.c
On 04/29/2013 12:49 AM, Stas Malyshev wrote: Hi! Are you sure about this change? Because this actually changes the semantics of the code. The following piece of code will now evaluate differently than before: *p = ' ' I also don't understand this change - this means 0xFF would now be skipped as space while before it was not. Is it the intended effect? I reverted the change to make I dont break anything. The better option would probably use the char * as it's passed and check for *p = \0 *p = ' ', David -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix implicit uint* to int* conversion warning: Zend/zend_builtin_functions.c
Commit:3411fbbc51cbd3e014c0f19d34b89c23ad5ba905
Author:David Soria Parra d...@php.net Fri, 26 Apr 2013 10:57:55
+0200
Parents: bc50ba4bf971c62a1ff5b915a0c9f890b04c1087
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=3411fbbc51cbd3e014c0f19d34b89c23ad5ba905
Log:
Fix implicit uint* to int* conversion warning
Changed paths:
M Zend/zend_builtin_functions.c
Diff:
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index d61aba1..47fb4d2 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1014,7 +1014,7 @@ ZEND_FUNCTION(get_object_vars)
while (zend_hash_get_current_data_ex(properties, (void **) value,
pos) == SUCCESS) {
if (zend_hash_get_current_key_ex(properties, key, key_len,
num_index, 0, pos) == HASH_KEY_IS_STRING) {
if (zend_check_property_access(zobj, key, key_len-1
TSRMLS_CC) == SUCCESS) {
- zend_unmangle_property_name_ex(key, key_len -
1, class_name, prop_name, prop_len);
+ zend_unmangle_property_name_ex(key, key_len -
1, class_name, prop_name, (int*) prop_len);
/* Not separating references */
Z_ADDREF_PP(value);
add_assoc_zval_ex(return_value, prop_name,
prop_len + 1, *value);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix #64711 (value computed but not used in parse_date.c): ext/date/lib/parse_date.c ext/date/lib/parse_date.re
Commit:b86c85723ed0dfec8197821ecb9e5dc84c3dd1f7
Author:David Soria Parra d...@php.net Fri, 26 Apr 2013 11:33:54
+0200
Parents: 3411fbbc51cbd3e014c0f19d34b89c23ad5ba905
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=b86c85723ed0dfec8197821ecb9e5dc84c3dd1f7
Log:
Fix #64711 (value computed but not used in parse_date.c)
Bugs:
https://bugs.php.net/64711
Changed paths:
M ext/date/lib/parse_date.c
M ext/date/lib/parse_date.re
Diff:
diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index 9f5593d..8f70748 100644
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Mar 31 10:47:54 2013 */
+/* Generated by re2c 0.13.5 on Fri Apr 26 11:10:28 2013 */
#line 1 ext/date/lib/parse_date.re
/*
+--+
@@ -25089,7 +25089,7 @@ timelib_time *timelib_parse_from_format(char *format,
char *string, int len, tim
break;
case '\\': /* escaped char */
- *fptr++;
+ ++fptr;
if (*ptr == *fptr) {
++ptr;
} else {
diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
index 8aaa6c3..014f6a0 100644
--- a/ext/date/lib/parse_date.re
+++ b/ext/date/lib/parse_date.re
@@ -2096,7 +2096,7 @@ timelib_time *timelib_parse_from_format(char *format,
char *string, int len, tim
break;
case '\\': /* escaped char */
- *fptr++;
+ ++fptr;
if (*ptr == *fptr) {
++ptr;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix #64712 (Obsolete declarations in php_date.c): ext/date/php_date.c
Commit:75cec90d8cc2ea34ab9e5e7146cb6b3bf29430a9 Author:David Soria Parra d...@php.net Fri, 26 Apr 2013 10:18:24 +0200 Parents: 2809afa1196bd73c3a5e5c119bd1d7db3cf45844 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=75cec90d8cc2ea34ab9e5e7146cb6b3bf29430a9 Log: Fix #64712 (Obsolete declarations in php_date.c) Bugs: https://bugs.php.net/64712 Changed paths: M ext/date/php_date.c Diff: diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 4ef3143..808dc5a 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -614,13 +614,11 @@ static void date_object_free_storage_interval(void *object TSRMLS_DC); static void date_object_free_storage_period(void *object TSRMLS_DC); static zend_object_value date_object_new_date(zend_class_entry *class_type TSRMLS_DC); -static zend_object_value date_object_new_immutable(zend_class_entry *class_type TSRMLS_DC); static zend_object_value date_object_new_timezone(zend_class_entry *class_type TSRMLS_DC); static zend_object_value date_object_new_interval(zend_class_entry *class_type TSRMLS_DC); static zend_object_value date_object_new_period(zend_class_entry *class_type TSRMLS_DC); static zend_object_value date_object_clone_date(zval *this_ptr TSRMLS_DC); -static zend_object_value date_object_clone_immutable(zval *this_ptr TSRMLS_DC); static zend_object_value date_object_clone_timezone(zval *this_ptr TSRMLS_DC); static zend_object_value date_object_clone_interval(zval *this_ptr TSRMLS_DC); static zend_object_value date_object_clone_period(zval *this_ptr TSRMLS_DC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix conversion from unsigned char to char: sapi/cgi/cgi_main.c
Commit:bc50ba4bf971c62a1ff5b915a0c9f890b04c1087
Author:David Soria Parra d...@php.net Fri, 26 Apr 2013 10:55:52
+0200
Parents: 75cec90d8cc2ea34ab9e5e7146cb6b3bf29430a9
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=bc50ba4bf971c62a1ff5b915a0c9f890b04c1087
Log:
Fix conversion from unsigned char to char
Changed paths:
M sapi/cgi/cgi_main.c
Diff:
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 9e6b74a..abe5e6b 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1818,7 +1818,7 @@ int main(int argc, char *argv[])
if((query_string = getenv(QUERY_STRING)) != NULL
strchr(query_string, '=') == NULL) {
/* we've got query string that has no = - apache CGI will pass
it to command line */
- unsigned char *p;
+ char *p;
decoded_query_string = strdup(query_string);
php_url_decode(decoded_query_string,
strlen(decoded_query_string));
for (p = decoded_query_string; *p *p = ' '; p++) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] tag php-src: update tag php-5.5.0beta4
Tag php-5.5.0beta4 in php-src.git was updated from d3f91c79a9502713ccc132368671816200851d94 Tag: 9a9a00f4dfa2d31d4439f9e87c9aabf58e5ed31b Tagger: David Soria Parrad...@php.net Thu Apr 25 08:24:03 2013 +0200 Log: PHP 5.5.0 Beta 4 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJReMwJAAoJEME8cLhyZ7UtbhIP/RSkCi07AJOxoDFt/14oJJFK Zb53MEXWoy4JNOVaOTJ6pWXyE/j6gm6KLB0qpuyithICkmKpVEaEHYLPBdFXK3cz poVqVOkH6fT87K8SOxGQGU6R20++ML5TuP9WCwgGzR/Y8GzssnLAUL8+768mdPlg FZm435mPrga6DvlqRqXyQfZ+xyFLexQkGtstI2yjiL4KqQlHoWbAujtu1T9p52XP VLaWrYlEe/QLHPlsW0h1TjNti/ULdjkA3GhlKM+1PqaNHVwX8wMl5IgoeSXiVjxS W9iVOro2PfN1e1g/k4bDXYV9jUg5epH8jRujkgP35ufo3OF6pvXl7PXpRYBEWFTn gI+qrlgIFHb7dOGTXzNf17SwGjHyrAl5/xCnJGP3bptm6KCj3miwH7BK78OA6Zsb p89tj/Pl9rELhE/tyPj+U7anyDynTwWCnWeQ722Po7+YW6V8ONFyUoV7CG5WL+oS R1GXURPb+E7hrEBCKH1SOahgnDb11GUPORRUiFHhAj54AqP+oscBO9nmmmNOo74J rGTuosU0tNm0H7QfcQmSfkkHzO0JldQpgaaytZLNgyUN7WtxAxqmi9XOqERYvuTi 7wnzCiBvMhkY697CMSeCaZEKEDQgNIkivsSBkrrrosJgRZ1ejrtRtvecrwzLAOI6 LoxdSWM/mlI19AP7FGRi =FC2l -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=9a9a00f4dfa2d31d4439f9e87c9aabf58e5ed31b Target: a2a22c46686604f07a06fc6805368c0c281f7808 Author: David Soria Parra d...@php.net Thu, 25 Apr 2013 08:06:51 +0200 Parents: 51e3fabf1032a55a3e50dcb6afe2552f6a777877 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a2a22c46686604f07a06fc6805368c0c281f7808 Target log: PHP 5.5.0 Beta 4 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 RC1: NEWS
Commit:4a52fe47551c97022ee770a5ae0c7d7c50727888 Author:David Soria Parra d...@php.net Thu, 25 Apr 2013 08:05:56 +0200 Parents: 51e3fabf1032a55a3e50dcb6afe2552f6a777877 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4a52fe47551c97022ee770a5ae0c7d7c50727888 Log: NEWS for RC1 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 2e44556..ddac905 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 2013, PHP 5.5.0 Release Candidate 1 + 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: NEWS for PHP 5.5.0 Beta 4 again: NEWS
Commit:51e3fabf1032a55a3e50dcb6afe2552f6a777877 Author:David Soria Parra d...@php.net Thu, 25 Apr 2013 08:05:16 +0200 Parents: e04baf692a6ff9492b42e231f7263f6d13f0f767 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=51e3fabf1032a55a3e50dcb6afe2552f6a777877 Log: NEWS for PHP 5.5.0 Beta 4 again Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index ddac905..2e44556 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,5 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.5.0 Release Candidate 1 - 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: Fix curl build on windows: ext/curl/config.w32
Commit:e04baf692a6ff9492b42e231f7263f6d13f0f767
Author:David Soria Parra d...@php.net Thu, 25 Apr 2013 08:04:30
+0200
Parents: 182fef46a989fa1f8d4ea1a7e3e22040f04e7c51
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=e04baf692a6ff9492b42e231f7263f6d13f0f767
Log:
Fix curl build on windows
Changed paths:
M ext/curl/config.w32
Diff:
diff --git a/ext/curl/config.w32 b/ext/curl/config.w32
index a481e29..9657213 100644
--- a/ext/curl/config.w32
+++ b/ext/curl/config.w32
@@ -13,7 +13,7 @@ if (PHP_CURL != no) {
(((PHP_ZLIB==no) (CHECK_LIB(zlib_a.lib;zlib.lib,
curl, PHP_CURL))) ||
(PHP_ZLIB_SHARED CHECK_LIB(zlib.lib, curl,
PHP_CURL)) || (PHP_ZLIB == yes (!PHP_ZLIB_SHARED)))
) {
- EXTENSION(curl, interface.c multi.c share.c streams.c
curl_file.c, true);
+ EXTENSION(curl, interface.c multi.c share.c curl_file.c,
true);
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
AC_DEFINE('HAVE_CURL_SSL', 1, 'Have SSL suppurt in cURL');
AC_DEFINE('HAVE_CURL_EASY_STRERROR', 1, 'Have
curl_easy_strerror in cURL');
--
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.0beta4
Tag php-5.5.0beta4 in php-src.git was created Tag: d3f91c79a9502713ccc132368671816200851d94 Tagger: David Soria Parrad...@php.net Wed Apr 24 12:56:28 2013 +0200 Log: PHP 5.5.0 Beta 4 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJRd7phAAoJEME8cLhyZ7Utuc8QAIZXfEj8ZbLpiJTXkUWFGZ8j WjgoAHJkrULyVYOw9cdYbvoFJtkICEHQDu+LWaInHgS/QdqTJj/GhrR1z+DPXT1w ez1S/69l//gPunoAFAFg+/Vv/sQd1OglU0pUlZ8v1Ah11aRVqs6Ta6H7zG7gDru+ Z8dir+uUe8PPBN3uNV8mAcN35hxj6zNabHx04I8ZW1/ur1TQNQAoIp4Hu392csap Q2d/jyjHeaoCiQjBbpbOavivbXv5Uqbbu3JQHmnmhQRi5PEzFSm4bKtvBSiN3+dz AioEGMtyVoJpeNwEJhy9iSSMKyZOgLVfD3QnJ/WYTFQUdi4ZBayTq2bw+VzvnMgn +3ukDBEuHuYQk3qXiyF9SrNrPR49Ybbw8sa4nvsHHYQazvo7v2USHs2ax2Q57APF Bmx7V+ZoOHw1vqBSV5ucfCUQ0ykBmEXdfIRxWeUetmC1sRNq7Ag/LTnsGsGSUOns uQj3hlbDRvV9o+vfCRm+CPJwpxlGCyN9qngKdrbZA3/jBSyCVOVUiB4PToRb1edx A/oY3NAFKQ7MTMSJ1SMG+QaZeRzihwBIrmKFFmO7upn/YxtMa1p+hRKe14G3rNpO JE1z/nxwT/TmZCzJMiKbRwEVjm1e453Jhi2r8j0R4i2LBHbfD9ABRQHGAUQ1gsBW 0tdhFCfM96K2k2chsI6o =RuV6 -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=d3f91c79a9502713ccc132368671816200851d94 Target: 7bc593bee6ed245be2d10db03b99a175d82a9900 Author: David Soria Parra d...@php.net Wed, 24 Apr 2013 12:38:26 +0200 Parents: 78c79a2d5b8d2bb46d645889ab1d0a19aec8108c Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7bc593bee6ed245be2d10db03b99a175d82a9900 Target log: PHP 5.5.0 Beta 4 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 RC 1: NEWS
Commit:ee65e6953f10c6e4d0e6e118ba53aebfe836302b Author:David Soria Parra d...@php.net Wed, 24 Apr 2013 12:39:44 +0200 Parents: 78c79a2d5b8d2bb46d645889ab1d0a19aec8108c Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ee65e6953f10c6e4d0e6e118ba53aebfe836302b Log: NEWS for RC 1 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 6b904aa..6904b78 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 2013, PHP 5.5.0 Release Candidate 1 + 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: NEWS for beta 4: NEWS
Commit:78c79a2d5b8d2bb46d645889ab1d0a19aec8108c Author:David Soria Parra d...@php.net Wed, 24 Apr 2013 12:37:07 +0200 Parents: 920c7ac16eaf7478fe419a362df53d01d208bfc2 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=78c79a2d5b8d2bb46d645889ab1d0a19aec8108c Log: NEWS for beta 4 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 74ed8dc..6b904aa 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 20??, PHP 5.5.0 Beta 4 +25 Apr 2013, PHP 5.5.0 Beta 4 - Core: . Fixed bug #64677 (execution operator `` stealing surrounding arguments). -- 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.0beta3
Tag php-5.5.0beta3 in php-src.git was created Tag: ea1cb20b961d0c70ad6e3189ba75a5460894414e Tagger: David Soria Parrad...@php.net Tue Apr 9 20:33:44 2013 +0200 Log: PHP 5.5.0 Beta 3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJRZF8MAAoJEME8cLhyZ7UtEOcQAM8M72yBNX++dm6T5bTYg86N sL4y9r9EMz9WwKBRTok5tjplBnguVe4ZjPzmmcXKFuvf6m/7cQ4CbYPuwAD73YBE RUwd57hb20Y2zc9mCn0BHIkQCGGY50pSM5y0Ik/wbPpV9MEndS9jgHDp1decxNL/ HdSxfUvYeOjfI8JEkrBLrU957jjCp4l2Br4M5aXt+jGMy85uvGFGfFu+06V4SV1V 6aWjKWzZnALJbof74iUgL+MlxWntA3RnXgocaopZkoFxyHRnyBSfUrFHduAU0KWL Unrb6rGCeoOpCGcgbKNjqYeQEVuZKatAWhQlfbhlPqv3GbUQHXqP4+x9f6fvATiK JX6XZcBvHV3eS9wkc/Vi1nKHO/GZlWnF9/BJ8iXf98VjmkvSQgVMyDxZnrVL6jCH 3wodqfZM+XfG/QfOhH8PHVfEA8QCvEsk8ALUL9R5j4zip98P0C9976WU5kzke9NB etDRB3tA2UsaqzHBkrQej9GvncPirgacDGNb96iDbuW0cD39j7P6xUamPDuAO4OY GDDUXpZPNuEDM10ziZsKEwGZor2cEgRQmpmIo4uaea/3f7egrfO/zkD5CHZAsdGz AhfhxEys7SzoTXVHF4Nf6EisHGnBxLF5RN3FUYkMCNBcwkieTsNzUj8njrRW+w+R Qg5dMve6RtRbqvI85WGA =M4UP -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=ea1cb20b961d0c70ad6e3189ba75a5460894414e Target: 6690cff375f5ffe4ba0e652f30b4b6ea8d35439f Author: David Soria Parra d...@php.net Tue, 9 Apr 2013 20:30:01 +0200 Parents: 6426a002e73932e8c6c58b391b6d76e85fb56f67 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6690cff375f5ffe4ba0e652f30b4b6ea8d35439f Target log: PHP 5.5.0 Beta 3 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 section for next beta: NEWS
Commit:1c498e6e942ec6f98e57c9fb803bef18dec30ba7 Author:David Soria Parra d...@php.net Tue, 9 Apr 2013 20:27:22 +0200 Parents: 6426a002e73932e8c6c58b391b6d76e85fb56f67 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1c498e6e942ec6f98e57c9fb803bef18dec30ba7 Log: NEWS section for next beta Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 7559717..eba2017 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 20??, PHP 5.5.0 Beta 4 + 11 Apr 2013, PHP 5.5.0 Beta 3 - Core: -- 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.0beta2
Tag php-5.5.0beta2 in php-src.git was created Tag: 31e91a41af26c3dacb90b48735aa803bddf3fabc Tagger: David Soria Parrad...@php.net Wed Mar 27 19:47:10 2013 +0100 Log: PHP 5.5.0 Beta 2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJRUz6xAAoJEME8cLhyZ7Ut82kP/0jMASBTea6xZUF67+2e1y3m YcbmqEsw4OV94lVTMoIx3RGNxlqL+d5EawrNtu5X2S1sEFmUDNLRh/VhtOQrQwso GCvN3OvzeCsdpsYFymNqOA1k6fGsif4mIwF0bBncg88xA0g+IsNWmK/x05s5Z33r oHp0X3PONWff890Iy38kwrpyP5F4rlDj+Apfju0PJoMI0exSqCIKMT0n7UYK7Z/Q 1wtHKPN/LyExT0Hs63A1AeigQDCNnKNibBEv2onuHAMYcNd9i8X6Vs22Vi7q/zIA YpPFOCdcCYV4lEkHtfVJSpfJ/MBjZ8R38ZGU1MqlzQ/+up1XjV2wqdu1C3xpPkuh 7wXRoWNB2U42kOmh7ifjkfvD0yeRqARAsZx9RXIKKlZ/Y7nYwtU14p9zKdd6oCqV hAa9nT5DrUACMdiWUd2jUWXeGV70UKZOTGG1/dro62nKlSHK38zpTld9cw6mSQZQ 49QIGRleAAuT3NAAJQL40EoYCMm2fQkKLH8qo6zRcbw1cK1eG3z50ahjcwn6IpYh 66ScXOD0Ah1SfvlOWnP26cRxHI7LIKb2fIyUCKRWmRShytrTNZsewebpRbwmr8/7 3jpKQG303+5TH9J5t4AEqUl9Hv1AC321xxWWJW/+yKSt+6/pw1M9zrmVjrcRm0ko GPTkOgBhoy4XGvagOXWI =UBNC -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=31e91a41af26c3dacb90b48735aa803bddf3fabc Target: c5ffec0d344836909da4856ab0ef3d834e672312 Author: David Soria Parra d...@php.net Wed, 27 Mar 2013 19:31:13 +0100 Parents: 2185746febea5c65187c86a6dc21d5b2034a950f Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c5ffec0d344836909da4856ab0ef3d834e672312 Target log: PHP 5.5.0 Beta 2 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 Section for beta 3: NEWS
Commit:ef6cdb85d9d10c3d2de229c54419b50b960e7789 Author:David Soria Parra d...@php.net Wed, 27 Mar 2013 19:57:24 +0100 Parents: 2185746febea5c65187c86a6dc21d5b2034a950f Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ef6cdb85d9d10c3d2de229c54419b50b960e7789 Log: NEWS Section for beta 3 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 6a14d15..2a57c34 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ PHPNEWS ||| +?? ??? 20??, PHP 5.5.0 Beta 3 + + 28 Mar 2013, PHP 5.5.0 Beta 2 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: News for beta 2: NEWS
Commit:2185746febea5c65187c86a6dc21d5b2034a950f Author:David Soria Parra d...@php.net Wed, 27 Mar 2013 19:30:43 +0100 Parents: 91ab11ed078f0fde6d17f278f7f3705c9fb38805 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2185746febea5c65187c86a6dc21d5b2034a950f Log: News for beta 2 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index e33c7a3..6a14d15 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 20??, PHP 5.5.0 Beta 2 +28 Mar 2013, PHP 5.5.0 Beta 2 - Core: . Fixed bug #64515 (Memoryleak when using the same variablename 2times in -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Remove unused variable: ext/dba/dba.c
Commit:f92a15864b366484470b7a371d553853a03d9b25
Author:David Soria Parra d...@php.net Wed, 27 Mar 2013 20:00:54
+0100
Parents: ef6cdb85d9d10c3d2de229c54419b50b960e7789
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=f92a15864b366484470b7a371d553853a03d9b25
Log:
Remove unused variable
Changed paths:
M ext/dba/dba.c
Diff:
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 303d65c..5273c05 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -538,7 +538,6 @@ PHP_MINFO_FUNCTION(dba)
*/
static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode)
{
- char *v;
int val_len;
zval *id;
dba_info *info = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Note about bison version: README.RELEASE_PROCESS
Commit:defb08c705ac40ed9c77a57c98ebe2d856a45e07 Author:David Soria Parra d...@php.net Fri, 22 Mar 2013 17:44:32 +0100 Parents: 6af1b08482f2b3a3fdb58693d37e1ed51007b83c Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=defb08c705ac40ed9c77a57c98ebe2d856a45e07 Log: Note about bison version Changed paths: M README.RELEASE_PROCESS Diff: diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS index c8eeb4e..58d3cd4 100644 --- a/README.RELEASE_PROCESS +++ b/README.RELEASE_PROCESS @@ -64,7 +64,8 @@ Do not use abbreviations for alpha and beta. ``git push --tags origin HEAD`` 8. run: ``./makedist 5.4.2RC2``, this will export the tree, create configure -and build three tarballs (gz,bz2 and xz). +and build three tarballs (gz,bz2 and xz). Make sure you use the same GNU Bison +version as snaps. Recent bison version are known to break ZTS. 9. Copy those three tarballs to www.php.net, in your homedir there should be a directory downloads/. Copy them into there, so that the system can generate -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Add OPCache ini settings to php.ini: php.ini-development php.ini-production
Commit:293d5defb4eb3962ac6b1ed6620ebc38836e5581 Author:David Soria Parra d...@php.net Thu, 21 Mar 2013 15:50:21 +0100 Parents: 534aec8a52955b841e30428b5efd1eff975b5e0d Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=293d5defb4eb3962ac6b1ed6620ebc38836e5581 Log: Add OPCache ini settings to php.ini Changed paths: M php.ini-development M php.ini-production Diff: diff --git a/php.ini-development b/php.ini-development index 93a4b7d..e79a3e0 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1860,6 +1860,99 @@ ldap.max_links = -1 [dba] ;dba.default_handler= +[opcache] +; Determines if Zend OPCache is enabled +;opcache.enable=0 + +; The OPcache shared memory storage size. +;opcache.memory_consumption=64 + +; The amount of memory for interned strings in Mbytes. +;opcache.interned_strings_buffer=4 + +; The maximum number of keys (scripts) in the OPcache hash table. +; Only numbers between 200 and 10 are allowed. +;opcache.max_accelerated_files=2000 + +; The maximum percentage of wasted memory until a restart is scheduled. +;opcache.max_wasted_percentage=5 + +; When this directive is enabled, the OPcache appends the current working +; directory to the script key, thus eliminating possible collisions between +; files with the same name (basename). Disabling the directive improves +; performance, but may break existing applications. +;opcache.use_cwd=1 + +; When disabled, you must reset the OPcache manually or restart the +; webserver for changes to the filesystem to take effect. +;opcache.validate_timestamps=1 + +; How often (in seconds) to check file timestamps for changes to the shared +; memory storage allocation. (1 means validate once per second, but only +; once per request. 0 means always validate) +;opcache.revalidate_freq=2 + +; Enables or disables file search in include_path optimization +;opcache.revalidate_path=0 + +; If disabled, all PHPDoc comments are dropped from the code to reduce the + ;size of the optimized code. +;opcache.save_comments=1 + +; If disabled, PHPDoc comments are not loaded from SHM, so Doc Comments +; may be always stored (save_comments=1), but not loaded by applications +; that don't need them anyway. +;opcache.load_comments=1 + +; If enabled, a fast shutdown sequence is used for the accelerated code +;opcache.fast_shutdown=0 + +; Allow file existence override (file_exists, etc.) performance feature. +;opcache.enable_file_override=0 + +; A bitmask, where each bit enables or disables the appropriate OPcache +; passes +;opcache.optimization_level=0x + +;opcache.inherited_hack=1 +;opcache.dups_fix=0 + +; The location of the OPcache blacklist file. +; The OPcache blacklist file is a text file that holds the names of files +; that should not be accelerated. The file format is to add each filename +; to a new line. The filename may be a full path or just a file prefix +; (i.e., /var/www/x blacklists all the files and directories in /var/www +; that start with 'x'). +;opcache.blacklist_filename= + +; Allows exclusion of large files from being cached. By default all files +; are cached. +;opcache.max_file_size=0 + +; Check the cache checksum each N requests. +; The default value of 0 means that the checks are disabled. +;opcache.consistency_checks=0 + +; How long to wait (in seconds) for a scheduled restart to begin if the cache +; is not being accessed. +;opcache.force_restart_timeout=180 + +; OPcache error_log file name. Empty string assumes stderr. +;opcache.error_log= + +; All OPcache errors go to the Web server log. +; By default, only fatal errors (level 0) or errors (level 1) are logged. +; You can also enable warnings (level 2), info messages (level 3) or +; debug messages (level 4). +;opcache.log_verbosity_level=1 + +; Preferred Shared Memory back-end. Leave empty and let the system decide. +;opcache.preferred_memory_model= + +; Protect the shared memory from unexpected writing during script execution. +; Useful for internal debugging only. +;opcache.protect_memory=0 + ; Local Variables: ; tab-width: 4 ; End: diff --git a/php.ini-production b/php.ini-production index 7d84c9b..33fcd3a 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1860,6 +1860,99 @@ ldap.max_links = -1 [dba] ;dba.default_handler= +[opcache] +; Determines if Zend OPCache is enabled +;opcache.enable=0 + +; The OPcache shared memory storage size. +;opcache.memory_consumption=64 + +; The amount of memory for interned strings in Mbytes. +;opcache.interned_strings_buffer=4 + +; The maximum number of keys (scripts) in the OPcache hash table. +; Only numbers between 200 and 10 are allowed. +;opcache.max_accelerated_files=2000 + +; The maximum percentage of wasted memory until a restart is scheduled. +;opcache.max_wasted_percentage=5 + +; When this directive is enabled, the OPcache appends the current working +; directory to the script key, thus eliminating possible collisions between +; files
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': php.ini-development php.ini-production
Commit:95c3b9ab397339978d7a2f2a196d2fa761410eb2 Author:David Soria Parra d...@php.net Thu, 21 Mar 2013 15:52:12 +0100 Parents: 9d2897a9d1bacc770d68268407c96f5907860ce1 293d5defb4eb3962ac6b1ed6620ebc38836e5581 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=95c3b9ab397339978d7a2f2a196d2fa761410eb2 Log: Merge branch 'PHP-5.5' * PHP-5.5: Add OPCache ini settings to php.ini Changed paths: MM php.ini-development MM php.ini-production Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: NEWS for array_column: NEWS
Commit:66b4e5cdec09782b3036a9c86250b09f6d22f521 Author:David Soria Parra d...@php.net Wed, 20 Mar 2013 13:14:20 +0100 Parents: 0173c4bab0357e58e74e2a84b18fa31034699582 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=66b4e5cdec09782b3036a9c86250b09f6d22f521 Log: NEWS for array_column Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 18d4d1e..f6432e8 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,8 @@ PHP NEWS - Core: . 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) . Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail). (Laruence) . Added support for changing the process's title in CLI/CLI-Server SAPIs. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'pull-request/257' into PHP-5.5: ext/standard/array.c ext/standard/basic_functions.c ext/standard/php_array.h
Commit:0173c4bab0357e58e74e2a84b18fa31034699582 Author:David Soria Parra d...@php.net Wed, 20 Mar 2013 13:02:33 +0100 Parents: bf8026aacf6ebeafca9c78928e3e660d7698ff6a f5bf1ba88fbacfebbb59b1e7bf43dd73649fa686 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0173c4bab0357e58e74e2a84b18fa31034699582 Log: Merge branch 'pull-request/257' into PHP-5.5 * pull-request/257: array_column: Fix compile-time warnings array_column: Removed array_pluck() alias array_column: Set array_pluck as an alias for array_column array_column: Implement ability to specify an index column Cleaning up a memory leak. array_column: Adding test for IS_OBJECT and converting object to string array_column: Using add_next_index_zval() at nikic's recommendation. array_column: Improved tests array_column: Cleaning up, as recommended in pull request #56 comments Fixing typo in test for array_column() Simplify the code and use zend_hash_next_index_insert() Adding test for columns not present in all rows for array_column(). Adding tests for the negative results of array_column() Implement new array function array_column() Bugs: https://bugs.php.net/56 Changed paths: MM ext/standard/array.c MM ext/standard/basic_functions.c MM ext/standard/php_array.h Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: array_column: Fix compile-time warnings: ext/standard/array.c
Commit:f5bf1ba88fbacfebbb59b1e7bf43dd73649fa686
Author:Ben Ramsey ram...@php.net Tue, 19 Mar 2013 20:44:19 -0500
Parents: 3439a098a0b646ff05d4da9748996214cac39d12
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=f5bf1ba88fbacfebbb59b1e7bf43dd73649fa686
Log:
array_column: Fix compile-time warnings
Changed paths:
M ext/standard/array.c
Diff:
diff --git a/ext/standard/array.c b/ext/standard/array.c
index fa19737..6983764 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2571,9 +2571,9 @@ PHP_FUNCTION(array_column)
zval *zarray, *zcolumn, *zkey = NULL, **data, **zcolval, **zkeyval;
HashTable *arr_hash;
HashPosition pointer;
- ulong column_idx = 0, key_idx = 0, keyval_idx = 0;
+ ulong column_idx = 0, key_idx = 0;
char *column = NULL, *key = NULL, *keyval = NULL;
- int column_len = 0, key_len = 0;
+ int column_len = 0, key_len = 0, keyval_idx = -1;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, az|z, zarray,
zcolumn, zkey) == FAILURE) {
return;
@@ -2640,13 +2640,13 @@ PHP_FUNCTION(array_column)
Z_ADDREF_PP(zcolval);
keyval = NULL;
- keyval_idx = NULL;
+ keyval_idx = -1;
if (zkey) {
if (key zend_hash_find(Z_ARRVAL_PP(data),
key, key_len + 1, (void**)zkeyval) == FAILURE) {
- keyval_idx = NULL;
+ keyval_idx = -1;
} else if (!key
zend_hash_index_find(Z_ARRVAL_PP(data), key_idx, (void**)zkeyval) == FAILURE) {
- keyval_idx = NULL;
+ keyval_idx = -1;
} else {
switch (Z_TYPE_PP(zkeyval)) {
case IS_LONG:
@@ -2660,14 +2660,14 @@ PHP_FUNCTION(array_column)
keyval =
Z_STRVAL_PP(zkeyval);
break;
default:
- keyval_idx = NULL;
+ keyval_idx = -1;
}
}
}
if (keyval) {
add_assoc_zval(return_value, keyval, *zcolval);
- } else if (keyval_idx != NULL) {
+ } else if (keyval_idx != -1) {
add_index_zval(return_value, keyval_idx,
*zcolval);
} else {
add_next_index_zval(return_value, *zcolval);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: array_column: Removed array_pluck() alias: ext/standard/basic_functions.c ext/standard/tests/array/array_column_pluck_alias.phpt ext/standard/tests/array/array_column_pluck_alia
Commit:3439a098a0b646ff05d4da9748996214cac39d12
Author:Ben Ramsey ram...@php.net Mon, 14 Jan 2013 10:04:14 -0600
Parents: a1876b6846898724f564208f78281dfd8ce07112
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=3439a098a0b646ff05d4da9748996214cac39d12
Log:
array_column: Removed array_pluck() alias
Changed paths:
M ext/standard/basic_functions.c
D ext/standard/tests/array/array_column_pluck_alias.phpt
D ext/standard/tests/array/array_column_pluck_alias_error.phpt
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 6e1835d..5e12352 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3306,7 +3306,6 @@ const zend_function_entry basic_functions[] = { /* {{{ */
PHP_FE(array_values,
arginfo_array_values)
PHP_FE(array_count_values,
arginfo_array_count_values)
PHP_FE(array_column,
arginfo_array_column)
- PHP_FALIAS(array_pluck, array_column,
arginfo_array_column)
PHP_FE(array_reverse,
arginfo_array_reverse)
PHP_FE(array_reduce,
arginfo_array_reduce)
PHP_FE(array_pad,
arginfo_array_pad)
diff --git a/ext/standard/tests/array/array_column_pluck_alias.phpt
b/ext/standard/tests/array/array_column_pluck_alias.phpt
deleted file mode 100644
index 4bd251a..000
--- a/ext/standard/tests/array/array_column_pluck_alias.phpt
+++ /dev/null
@@ -1,307 +0,0 @@
---TEST--
-Test array_pluck() function: basic functionality
---FILE--
-?php
-/* Prototype:
- * array array_pluck(array $input, mixed $column_key[, mixed $index_key]);
- * Description:
- * Returns an array containing all the values from
- * the specified column in a two-dimensional array.
- */
-
-echo *** Testing array_pluck() : basic functionality ***\n;
-/* Array representing a possible record set returned from a database */
-$records = array(
- array(
- 'id' = 1,
- 'first_name' = 'John',
- 'last_name' = 'Doe'
- ),
- array(
- 'id' = 2,
- 'first_name' = 'Sally',
- 'last_name' = 'Smith'
- ),
- array(
- 'id' = 3,
- 'first_name' = 'Jane',
- 'last_name' = 'Jones'
- )
-);
-
-echo -- first_name column from recordset --\n;
-var_dump(array_pluck($records, 'first_name'));
-
-echo -- id column from recordset --\n;
-var_dump(array_pluck($records, 'id'));
-
-echo -- last_name column from recordset, keyed by value from id column --\n;
-var_dump(array_pluck($records, 'last_name', 'id'));
-
-echo -- last_name column from recordset, keyed by value from first_name
column --\n;
-var_dump(array_pluck($records, 'last_name', 'first_name'));
-
-echo \n*** Testing multiple data types ***\n;
-$file = basename(__FILE__);
-$fh = fopen($file, 'r', true);
-$values = array(
- array(
- 'id' = 1,
- 'value' = new stdClass
- ),
- array(
- 'id' = 2,
- 'value' = 34.2345
- ),
- array(
- 'id' = 3,
- 'value' = true
- ),
- array(
- 'id' = 4,
- 'value' = false
- ),
- array(
- 'id' = 5,
- 'value' = null
- ),
- array(
- 'id' = 6,
- 'value' = 1234
- ),
- array(
- 'id' = 7,
- 'value' = 'Foo'
- ),
- array(
- 'id' = 8,
- 'value' = $fh
- )
-);
-var_dump(array_pluck($values, 'value'));
-var_dump(array_pluck($values, 'value', 'id'));
-
-echo \n*** Testing numeric column keys ***\n;
-$numericCols = array(
- array('aaa', '111'),
- array('bbb', '222'),
- array('ccc', '333')
-);
-var_dump(array_pluck($numericCols, 1));
-var_dump(array_pluck($numericCols, 1, 0));
-
-echo \n*** Testing failure to find specified column ***\n;
-var_dump(array_pluck($numericCols, 2));
-var_dump(array_pluck($numericCols, 'foo'));
-var_dump(array_pluck($numericCols, 0, 'foo'));
-
-echo \n*** Testing single dimensional array ***\n;
-$singleDimension = array('foo', 'bar', 'baz');
-var_dump(array_pluck($singleDimension, 1));
-
-echo \n*** Testing columns not present in all rows ***\n;
-$mismatchedColumns =
[PHP-CVS] com php-src: array_column: Set array_pluck as an alias for array_column: ext/standard/basic_functions.c ext/standard/tests/array/array_column_pluck_alias.phpt ext/standard/tests/array/array_
Commit:a1876b6846898724f564208f78281dfd8ce07112
Author:Ben Ramsey ram...@php.net Fri, 11 Jan 2013 17:09:34 -0600
Parents: 5bc2854b37778d7f402db8bb9be9fe33df64258e
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=a1876b6846898724f564208f78281dfd8ce07112
Log:
array_column: Set array_pluck as an alias for array_column
Changed paths:
M ext/standard/basic_functions.c
A ext/standard/tests/array/array_column_pluck_alias.phpt
A ext/standard/tests/array/array_column_pluck_alias_error.phpt
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 5e12352..6e1835d 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3306,6 +3306,7 @@ const zend_function_entry basic_functions[] = { /* {{{ */
PHP_FE(array_values,
arginfo_array_values)
PHP_FE(array_count_values,
arginfo_array_count_values)
PHP_FE(array_column,
arginfo_array_column)
+ PHP_FALIAS(array_pluck, array_column,
arginfo_array_column)
PHP_FE(array_reverse,
arginfo_array_reverse)
PHP_FE(array_reduce,
arginfo_array_reduce)
PHP_FE(array_pad,
arginfo_array_pad)
diff --git a/ext/standard/tests/array/array_column_pluck_alias.phpt
b/ext/standard/tests/array/array_column_pluck_alias.phpt
new file mode 100644
index 000..4bd251a
--- /dev/null
+++ b/ext/standard/tests/array/array_column_pluck_alias.phpt
@@ -0,0 +1,307 @@
+--TEST--
+Test array_pluck() function: basic functionality
+--FILE--
+?php
+/* Prototype:
+ * array array_pluck(array $input, mixed $column_key[, mixed $index_key]);
+ * Description:
+ * Returns an array containing all the values from
+ * the specified column in a two-dimensional array.
+ */
+
+echo *** Testing array_pluck() : basic functionality ***\n;
+/* Array representing a possible record set returned from a database */
+$records = array(
+ array(
+ 'id' = 1,
+ 'first_name' = 'John',
+ 'last_name' = 'Doe'
+ ),
+ array(
+ 'id' = 2,
+ 'first_name' = 'Sally',
+ 'last_name' = 'Smith'
+ ),
+ array(
+ 'id' = 3,
+ 'first_name' = 'Jane',
+ 'last_name' = 'Jones'
+ )
+);
+
+echo -- first_name column from recordset --\n;
+var_dump(array_pluck($records, 'first_name'));
+
+echo -- id column from recordset --\n;
+var_dump(array_pluck($records, 'id'));
+
+echo -- last_name column from recordset, keyed by value from id column --\n;
+var_dump(array_pluck($records, 'last_name', 'id'));
+
+echo -- last_name column from recordset, keyed by value from first_name
column --\n;
+var_dump(array_pluck($records, 'last_name', 'first_name'));
+
+echo \n*** Testing multiple data types ***\n;
+$file = basename(__FILE__);
+$fh = fopen($file, 'r', true);
+$values = array(
+ array(
+ 'id' = 1,
+ 'value' = new stdClass
+ ),
+ array(
+ 'id' = 2,
+ 'value' = 34.2345
+ ),
+ array(
+ 'id' = 3,
+ 'value' = true
+ ),
+ array(
+ 'id' = 4,
+ 'value' = false
+ ),
+ array(
+ 'id' = 5,
+ 'value' = null
+ ),
+ array(
+ 'id' = 6,
+ 'value' = 1234
+ ),
+ array(
+ 'id' = 7,
+ 'value' = 'Foo'
+ ),
+ array(
+ 'id' = 8,
+ 'value' = $fh
+ )
+);
+var_dump(array_pluck($values, 'value'));
+var_dump(array_pluck($values, 'value', 'id'));
+
+echo \n*** Testing numeric column keys ***\n;
+$numericCols = array(
+ array('aaa', '111'),
+ array('bbb', '222'),
+ array('ccc', '333')
+);
+var_dump(array_pluck($numericCols, 1));
+var_dump(array_pluck($numericCols, 1, 0));
+
+echo \n*** Testing failure to find specified column ***\n;
+var_dump(array_pluck($numericCols, 2));
+var_dump(array_pluck($numericCols, 'foo'));
+var_dump(array_pluck($numericCols, 0, 'foo'));
+
+echo \n*** Testing single dimensional array ***\n;
+$singleDimension = array('foo', 'bar', 'baz');
+var_dump(array_pluck($singleDimension, 1));
+
+echo \n*** Testing columns not present in all rows ***\n;
[PHP-CVS] com php-src: array_column: Implement ability to specify an index column: ext/standard/array.c ext/standard/basic_functions.c ext/standard/tests/array/array_column_basic.phpt ext/standard/tes
Commit:5bc2854b37778d7f402db8bb9be9fe33df64258e
Author:Ben Ramsey ram...@php.net Fri, 11 Jan 2013 16:57:11 -0600
Parents: 94d5b2519aa6790e603cec7a054900941ffe07a9
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=5bc2854b37778d7f402db8bb9be9fe33df64258e
Log:
array_column: Implement ability to specify an index column
Changed paths:
M ext/standard/array.c
M ext/standard/basic_functions.c
M ext/standard/tests/array/array_column_basic.phpt
M ext/standard/tests/array/array_column_error.phpt
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 91a8833..fa19737 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2563,42 +2563,66 @@ PHP_FUNCTION(array_count_values)
}
/* }}} */
-/* {{{ proto array array_column(array input, mixed key)
- Return the values from a single column in the input array, identified by
the key */
+/* {{{ proto array array_column(array input, mixed column_key[, mixed
index_key])
+ Return the values from a single column in the input array, identified by the
+ value_key and optionally indexed by the index_key */
PHP_FUNCTION(array_column)
{
- zval *zarray, *zoffset, **data, **zvalue;
+ zval *zarray, *zcolumn, *zkey = NULL, **data, **zcolval, **zkeyval;
HashTable *arr_hash;
HashPosition pointer;
- long index = 0;
- char *key = NULL;
- int key_len = 0;
+ ulong column_idx = 0, key_idx = 0, keyval_idx = 0;
+ char *column = NULL, *key = NULL, *keyval = NULL;
+ int column_len = 0, key_len = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, az, zarray,
zoffset) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, az|z, zarray,
zcolumn, zkey) == FAILURE) {
return;
}
- switch (Z_TYPE_P(zoffset)) {
+ switch (Z_TYPE_P(zcolumn)) {
case IS_NULL:
- index = 0;
+ column_idx = 0;
break;
case IS_LONG:
- index = Z_LVAL_P(zoffset);
+ column_idx = Z_LVAL_P(zcolumn);
break;
case IS_STRING:
- key = Z_STRVAL_P(zoffset);
- key_len = Z_STRLEN_P(zoffset);
+ column = Z_STRVAL_P(zcolumn);
+ column_len = Z_STRLEN_P(zcolumn);
break;
case IS_OBJECT:
- convert_to_string(zoffset);
- key = Z_STRVAL_P(zoffset);
- key_len = Z_STRLEN_P(zoffset);
+ convert_to_string(zcolumn);
+ column = Z_STRVAL_P(zcolumn);
+ column_len = Z_STRLEN_P(zcolumn);
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, The key
should be either a string or an integer);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, The column
key should be either a string or an integer);
RETURN_FALSE;
}
+ if (zkey) {
+ switch (Z_TYPE_P(zkey)) {
+ case IS_NULL:
+ key_idx = 0;
+ break;
+ case IS_LONG:
+ key_idx = Z_LVAL_P(zkey);
+ break;
+ case IS_STRING:
+ key = Z_STRVAL_P(zkey);
+ key_len = Z_STRLEN_P(zkey);
+ break;
+ case IS_OBJECT:
+ convert_to_string(zkey);
+ key = Z_STRVAL_P(zkey);
+ key_len = Z_STRLEN_P(zkey);
+ break;
+ default:
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
The index key should be either a string or an integer);
+ RETURN_FALSE;
+ }
+ }
+
arr_hash = Z_ARRVAL_P(zarray);
array_init(return_value);
@@ -2607,14 +2631,47 @@ PHP_FUNCTION(array_column)
zend_hash_move_forward_ex(arr_hash, pointer)) {
if (Z_TYPE_PP(data) == IS_ARRAY) {
- if (key zend_hash_find(Z_ARRVAL_PP(data), key,
key_len + 1, (void**)zvalue) == FAILURE) {
+ if (column zend_hash_find(Z_ARRVAL_PP(data), column,
column_len + 1, (void**)zcolval) == FAILURE) {
continue;
- } else if (!key
zend_hash_index_find(Z_ARRVAL_PP(data), index, (void**)zvalue) == FAILURE) {
+ } else if (!column
zend_hash_index_find(Z_ARRVAL_PP(data), column_idx, (void**)zcolval) ==
FAILURE) {
[PHP-CVS] com php-src: Cleaning up a memory leak.: ext/standard/array.c
Commit:94d5b2519aa6790e603cec7a054900941ffe07a9 Author:Ben Ramsey ram...@php.net Thu, 21 Jun 2012 12:47:54 -0500 Parents: 20ab30339d9731dd6e85ea5029280148f519cdc7 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=94d5b2519aa6790e603cec7a054900941ffe07a9 Log: Cleaning up a memory leak. Changed paths: M ext/standard/array.c Diff: diff --git a/ext/standard/array.c b/ext/standard/array.c index 00850ba..91a8833 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2590,7 +2590,7 @@ PHP_FUNCTION(array_column) key_len = Z_STRLEN_P(zoffset); break; case IS_OBJECT: - convert_to_string_ex(zoffset); + convert_to_string(zoffset); key = Z_STRVAL_P(zoffset); key_len = Z_STRLEN_P(zoffset); break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: array_column: Adding test for IS_OBJECT and converting object to string: ext/standard/array.c ext/standard/tests/array/array_column_basic.phpt
Commit:20ab30339d9731dd6e85ea5029280148f519cdc7
Author:Ben Ramsey ram...@php.net Sun, 15 Apr 2012 21:40:45 -0500
Parents: 66a02eb25e1533c2ace47f8d934b193ebe317cde
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=20ab30339d9731dd6e85ea5029280148f519cdc7
Log:
array_column: Adding test for IS_OBJECT and converting object to string
Changed paths:
M ext/standard/array.c
M ext/standard/tests/array/array_column_basic.phpt
Diff:
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 40ee947..00850ba 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2589,6 +2589,11 @@ PHP_FUNCTION(array_column)
key = Z_STRVAL_P(zoffset);
key_len = Z_STRLEN_P(zoffset);
break;
+ case IS_OBJECT:
+ convert_to_string_ex(zoffset);
+ key = Z_STRVAL_P(zoffset);
+ key_len = Z_STRLEN_P(zoffset);
+ break;
default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, The key
should be either a string or an integer);
RETURN_FALSE;
diff --git a/ext/standard/tests/array/array_column_basic.phpt
b/ext/standard/tests/array/array_column_basic.phpt
index efa98ce..fa8fe2f 100644
--- a/ext/standard/tests/array/array_column_basic.phpt
+++ b/ext/standard/tests/array/array_column_basic.phpt
@@ -97,6 +97,17 @@ $mismatchedColumns = array(
);
var_dump(array_column($mismatchedColumns, 'c'));
+echo \n*** Testing use of object converted to string ***\n;
+class Foo
+{
+public function __toString()
+{
+return 'last_name';
+}
+}
+$f = new Foo();
+var_dump(array_column($records, $f));
+
echo Done\n;
?
--EXPECTF--
@@ -166,4 +177,14 @@ array(1) {
[0]=
string(3) qux
}
+
+*** Testing use of object converted to string ***
+array(3) {
+ [0]=
+ string(3) Doe
+ [1]=
+ string(5) Smith
+ [2]=
+ string(5) Jones
+}
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: array_column: Using add_next_index_zval() at nikic's recommendation.: ext/standard/array.c
Commit:66a02eb25e1533c2ace47f8d934b193ebe317cde Author:Ben Ramsey ram...@php.net Sat, 14 Apr 2012 11:36:58 -0500 Parents: 5f6b20a44d833ede5e47b3b09c98678522347de1 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=66a02eb25e1533c2ace47f8d934b193ebe317cde Log: array_column: Using add_next_index_zval() at nikic's recommendation. Changed paths: M ext/standard/array.c Diff: diff --git a/ext/standard/array.c b/ext/standard/array.c index b5d8275..40ee947 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2609,7 +2609,7 @@ PHP_FUNCTION(array_column) } Z_ADDREF_PP(zvalue); - zend_hash_next_index_insert(HASH_OF(return_value), (void **)zvalue, sizeof(zval *), NULL); + add_next_index_zval(return_value, *zvalue); } } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: array_column: Improved tests: ext/standard/tests/array/array_column.phpt ext/standard/tests/array/array_column_basic.phpt ext/standard/tests/array/array_column_error.phpt
Commit:5f6b20a44d833ede5e47b3b09c98678522347de1
Author:Ben Ramsey ram...@php.net Sat, 14 Apr 2012 11:19:55 -0500
Parents: e921d28ae31e77965800c29454c4d426650126f0
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=5f6b20a44d833ede5e47b3b09c98678522347de1
Log:
array_column: Improved tests
Changed paths:
D ext/standard/tests/array/array_column.phpt
A ext/standard/tests/array/array_column_basic.phpt
A ext/standard/tests/array/array_column_error.phpt
diff --git a/ext/standard/tests/array/array_column.phpt
b/ext/standard/tests/array/array_column.phpt
deleted file mode 100644
index a7a1b45..000
--- a/ext/standard/tests/array/array_column.phpt
+++ /dev/null
@@ -1,169 +0,0 @@
---TEST--
-Test array_column() function
---FILE--
-?php
-/* Prototype:
- * array array_column(array $input, mixed $key);
- * Description:
- * Returns an array containing all the values from
- * the specified column in a two-dimensional array.
- */
-
-echo *** Testing basic functionalities ***\n;
-/* Array representing a possible record set returned from a database */
-$records = array(
- array(
- 'id' = 1,
- 'first_name' = 'John',
- 'last_name' = 'Doe'
- ),
- array(
- 'id' = 2,
- 'first_name' = 'Sally',
- 'last_name' = 'Smith'
- ),
- array(
- 'id' = 3,
- 'first_name' = 'Jane',
- 'last_name' = 'Jones'
- )
-);
-
-echo -- first_name column from recordset --\n;
-var_dump(array_column($records, 'first_name'));
-
-echo -- id column from recordset --\n;
-var_dump(array_column($records, 'id'));
-
-echo \n*** Testing multiple data types ***\n;
-$file = basename(__FILE__);
-$fh = fopen($file, 'r', true);
-$values = array(
- array(
- 'id' = 1,
- 'value' = new stdClass
- ),
- array(
- 'id' = 2,
- 'value' = 34.2345
- ),
- array(
- 'id' = 3,
- 'value' = true
- ),
- array(
- 'id' = 4,
- 'value' = false
- ),
- array(
- 'id' = 5,
- 'value' = null
- ),
- array(
- 'id' = 6,
- 'value' = 1234
- ),
- array(
- 'id' = 7,
- 'value' = 'Foo'
- ),
- array(
- 'id' = 8,
- 'value' = $fh
- )
-);
-var_dump(array_column($values, 'value'));
-
-echo \n*** Testing numeric column keys ***\n;
-$numericCols = array(
- array('aaa', '111'),
- array('bbb', '222'),
- array('ccc', '333')
-);
-var_dump(array_column($numericCols, 1));
-
-echo \n*** Testing failure to find specified column ***\n;
-var_dump(array_column($numericCols, 2));
-var_dump(array_column($numericCols, 'foo'));
-
-echo \n*** Testing single dimensional array ***\n;
-$singleDimension = array('foo', 'bar', 'baz');
-var_dump(array_column($singleDimension, 1));
-
-echo \n*** Testing columns not present in all rows ***\n;
-$mismatchedColumns = array(
-array('a' = 'foo', 'b' = 'bar'),
-array('a' = 'baz', 'c' = 'qux'),
-);
-var_dump(array_column($mismatchedColumns, 'c'));
-
-echo Done\n;
-?
---EXPECTF--
-*** Testing basic functionalities ***
--- first_name column from recordset --
-array(3) {
- [0]=
- string(4) John
- [1]=
- string(5) Sally
- [2]=
- string(4) Jane
-}
--- id column from recordset --
-array(3) {
- [0]=
- int(1)
- [1]=
- int(2)
- [2]=
- int(3)
-}
-
-*** Testing multiple data types ***
-array(8) {
- [0]=
- object(stdClass)#1 (0) {
- }
- [1]=
- float(34.2345)
- [2]=
- bool(true)
- [3]=
- bool(false)
- [4]=
- NULL
- [5]=
- int(1234)
- [6]=
- string(3) Foo
- [7]=
- resource(5) of type (stream)
-}
-
-*** Testing numeric column keys ***
-array(3) {
- [0]=
- string(3) 111
- [1]=
- string(3) 222
- [2]=
- string(3) 333
-}
-
-*** Testing failure to find specified column ***
-array(0) {
-}
-array(0) {
-}
-
-*** Testing single dimensional array ***
-array(0) {
-}
-
-*** Testing columns not present in all rows ***
-array(1) {
- [0]=
- string(3) qux
-}
-Done
diff --git a/ext/standard/tests/array/array_column_basic.phpt
b/ext/standard/tests/array/array_column_basic.phpt
new file mode 100644
index 000..efa98ce
--- /dev/null
+++ b/ext/standard/tests/array/array_column_basic.phpt
@@ -0,0 +1,169 @@
+--TEST--
+Test array_column() function: basic functionality
+--FILE--
+?php
+/* Prototype:
+ * array array_column(array $input, mixed $key);
+ * Description:
+ * Returns an array containing all the values from
+ * the specified column in a two-dimensional array.
+ */
+
+echo *** Testing array_column() : basic functionality ***\n;
+/* Array representing a possible record set returned from a database */
+$records = array(
+ array(
+ 'id' = 1,
+ 'first_name' = 'John',
+
[PHP-CVS] com php-src: array_column: Cleaning up, as recommended in pull request #56 comments: ext/standard/array.c
Commit:e921d28ae31e77965800c29454c4d426650126f0
Author:Ben Ramsey ram...@php.net Sat, 14 Apr 2012 08:23:51 -0500
Parents: 10da6f00b8d0fa573b3c44f685377a98a816af51
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=e921d28ae31e77965800c29454c4d426650126f0
Log:
array_column: Cleaning up, as recommended in pull request #56 comments
Bugs:
https://bugs.php.net/56
Changed paths:
M ext/standard/array.c
Diff:
diff --git a/ext/standard/array.c b/ext/standard/array.c
index c5d0fa7..b5d8275 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2578,19 +2578,11 @@ PHP_FUNCTION(array_column)
return;
}
- arr_hash = Z_ARRVAL_P(zarray);
- array_init(return_value);
-
switch (Z_TYPE_P(zoffset)) {
case IS_NULL:
index = 0;
break;
- case IS_DOUBLE:
- index = (long)Z_DVAL_P(zoffset);
- break;
- case IS_BOOL:
case IS_LONG:
- case IS_RESOURCE:
index = Z_LVAL_P(zoffset);
break;
case IS_STRING:
@@ -2599,9 +2591,12 @@ PHP_FUNCTION(array_column)
break;
default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, The key
should be either a string or an integer);
- return;
+ RETURN_FALSE;
}
+ arr_hash = Z_ARRVAL_P(zarray);
+ array_init(return_value);
+
for (zend_hash_internal_pointer_reset_ex(arr_hash, pointer);
zend_hash_get_current_data_ex(arr_hash, (void**)data,
pointer) == SUCCESS;
zend_hash_move_forward_ex(arr_hash, pointer)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Simplify the code and use zend_hash_next_index_insert(): ext/standard/array.c
Commit:6a27b890e6d643f17072e561a5d4f87211195a7c
Author:Ben Ramsey ram...@php.net Sat, 14 Apr 2012 02:39:25 -0500
Parents: dc4dfe8ae019ec1fddc05ac340ed612a9c3f6d34
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=6a27b890e6d643f17072e561a5d4f87211195a7c
Log:
Simplify the code and use zend_hash_next_index_insert()
Changed paths:
M ext/standard/array.c
Diff:
diff --git a/ext/standard/array.c b/ext/standard/array.c
index b707301..c5d0fa7 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2613,31 +2613,8 @@ PHP_FUNCTION(array_column)
continue;
}
- switch (Z_TYPE_PP(zvalue)) {
- case IS_NULL:
- add_next_index_null(return_value);
- break;
- case IS_LONG:
- add_next_index_long(return_value,
Z_LVAL_PP(zvalue));
- break;
- case IS_DOUBLE:
- add_next_index_double(return_value,
Z_DVAL_PP(zvalue));
- break;
- case IS_BOOL:
- add_next_index_bool(return_value,
Z_BVAL_PP(zvalue));
- break;
- case IS_OBJECT:
- zval_add_ref(zvalue);
- add_next_index_zval(return_value,
*zvalue);
- break;
- case IS_STRING:
- add_next_index_stringl(return_value,
Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue), 1);
- break;
- case IS_RESOURCE:
- zval_add_ref(zvalue);
- add_next_index_resource(return_value,
Z_RESVAL_PP(zvalue));
- break;
- }
+ Z_ADDREF_PP(zvalue);
+ zend_hash_next_index_insert(HASH_OF(return_value),
(void **)zvalue, sizeof(zval *), NULL);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Implement new array function array_column(): ext/standard/array.c ext/standard/basic_functions.c ext/standard/php_array.h ext/standard/tests/array/array_column.phpt
Commit:9035a1ed246d4d2d867edc01616ca96b40a7cd11
Author:Ben Ramsey ram...@php.net Fri, 13 Apr 2012 23:17:56 -0500
Parents: e1410b5a70543856de3978603b41fbf2ca5d330c
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=9035a1ed246d4d2d867edc01616ca96b40a7cd11
Log:
Implement new array function array_column()
array_column() returns the values of the specified column from a
multi-dimensional array.
Changed paths:
M ext/standard/array.c
M ext/standard/basic_functions.c
M ext/standard/php_array.h
A ext/standard/tests/array/array_column.phpt
Diff:
diff --git a/ext/standard/array.c b/ext/standard/array.c
index d1397a5..b707301 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2563,6 +2563,87 @@ PHP_FUNCTION(array_count_values)
}
/* }}} */
+/* {{{ proto array array_column(array input, mixed key)
+ Return the values from a single column in the input array, identified by
the key */
+PHP_FUNCTION(array_column)
+{
+ zval *zarray, *zoffset, **data, **zvalue;
+ HashTable *arr_hash;
+ HashPosition pointer;
+ long index = 0;
+ char *key = NULL;
+ int key_len = 0;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, az, zarray,
zoffset) == FAILURE) {
+ return;
+ }
+
+ arr_hash = Z_ARRVAL_P(zarray);
+ array_init(return_value);
+
+ switch (Z_TYPE_P(zoffset)) {
+ case IS_NULL:
+ index = 0;
+ break;
+ case IS_DOUBLE:
+ index = (long)Z_DVAL_P(zoffset);
+ break;
+ case IS_BOOL:
+ case IS_LONG:
+ case IS_RESOURCE:
+ index = Z_LVAL_P(zoffset);
+ break;
+ case IS_STRING:
+ key = Z_STRVAL_P(zoffset);
+ key_len = Z_STRLEN_P(zoffset);
+ break;
+ default:
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, The key
should be either a string or an integer);
+ return;
+ }
+
+ for (zend_hash_internal_pointer_reset_ex(arr_hash, pointer);
+ zend_hash_get_current_data_ex(arr_hash, (void**)data,
pointer) == SUCCESS;
+ zend_hash_move_forward_ex(arr_hash, pointer)) {
+
+ if (Z_TYPE_PP(data) == IS_ARRAY) {
+ if (key zend_hash_find(Z_ARRVAL_PP(data), key,
key_len + 1, (void**)zvalue) == FAILURE) {
+ continue;
+ } else if (!key
zend_hash_index_find(Z_ARRVAL_PP(data), index, (void**)zvalue) == FAILURE) {
+ continue;
+ }
+
+ switch (Z_TYPE_PP(zvalue)) {
+ case IS_NULL:
+ add_next_index_null(return_value);
+ break;
+ case IS_LONG:
+ add_next_index_long(return_value,
Z_LVAL_PP(zvalue));
+ break;
+ case IS_DOUBLE:
+ add_next_index_double(return_value,
Z_DVAL_PP(zvalue));
+ break;
+ case IS_BOOL:
+ add_next_index_bool(return_value,
Z_BVAL_PP(zvalue));
+ break;
+ case IS_OBJECT:
+ zval_add_ref(zvalue);
+ add_next_index_zval(return_value,
*zvalue);
+ break;
+ case IS_STRING:
+ add_next_index_stringl(return_value,
Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue), 1);
+ break;
+ case IS_RESOURCE:
+ zval_add_ref(zvalue);
+ add_next_index_resource(return_value,
Z_RESVAL_PP(zvalue));
+ break;
+ }
+ }
+
+ }
+}
+/* }}} */
+
/* {{{ proto array array_reverse(array input [, bool preserve keys])
Return input as a new array with the order of the entries reversed */
PHP_FUNCTION(array_reverse)
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 61e2f39..2e44150 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -433,6 +433,11 @@ ZEND_BEGIN_ARG_INFO(arginfo_array_count_values, 0)
ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO_EX(arginfo_array_column, 0, 0, 2)
+ ZEND_ARG_INFO(0,
[PHP-CVS] com php-src: NEWS section for beta 2: NEWS
Commit:225835045045c9227199382f763f424e2d3be1e2 Author:David Soria Parra d...@php.net Wed, 20 Mar 2013 15:07:08 +0100 Parents: 7f2424bb1d329bb25694f309b09905180aca228e Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=225835045045c9227199382f763f424e2d3be1e2 Log: NEWS section for beta 2 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 5f29170..36a98ab 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ PHPNEWS ||| +?? ??? 20??, PHP 5.5.0 Beta 2 + + 21 Mar 2013, PHP 5.5.0 Beta 1 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: NEWS for beta 1: NEWS
Commit:7f2424bb1d329bb25694f309b09905180aca228e Author:David Soria Parra d...@php.net Wed, 20 Mar 2013 15:06:15 +0100 Parents: 52171aeaf41545205fb960e1a01d4dd33d09137b Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7f2424bb1d329bb25694f309b09905180aca228e Log: NEWS for beta 1 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index f6432e8..5f29170 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 20??, PHP 5.5.0 Beta 1 +21 Mar 2013, PHP 5.5.0 Beta 1 - Core: . Added Zend Opcache extension and enable building it by default. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Allow local override of PHPROOT in makedist: makedist
Commit:52171aeaf41545205fb960e1a01d4dd33d09137b
Author:David Soria Parra d...@php.net Wed, 20 Mar 2013 15:16:24
+0100
Parents: 66b4e5cdec09782b3036a9c86250b09f6d22f521
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=52171aeaf41545205fb960e1a01d4dd33d09137b
Log:
Allow local override of PHPROOT in makedist
Changed paths:
M makedist
Diff:
diff --git a/makedist b/makedist
index bce40a9..f5823d3 100755
--- a/makedist
+++ b/makedist
@@ -35,7 +35,10 @@ if test ${1} = 1 -a ${2} -lt 28; then
fi
IFS=$old_IFS
-PHPROOT=g...@git.php.net:php-src.git
+if test $PHPROOTx == x; then
+PHPROOT=g...@git.php.net:php-src.git;
+fi
+
LT_TARGETS='ltconfig ltmain.sh config.guess config.sub'
if echo '\c' | grep -s c /dev/null 21
--
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.0beta1
Tag php-5.5.0beta1 in php-src.git was created Tag: 90029edadd35fc2a61f812c34f9374c338ce8016 Tagger: David Soria Parrad...@php.net Wed Mar 20 15:17:06 2013 +0100 Log: PHP 5.5.0 Beta 1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJRScTmAAoJEME8cLhyZ7Ut0UUQALHl7eJ9tJT/Gt86zc4h6qzy Zhp4dxCg0kEvsModpRMK8BpAZKxyChV+iJS8dKuZnrJdYmKCcZl0paARfvYNvqdU tzYGjfdrP2CU5hCQsrPnrgR3t/4cngQ2sGR+2J+VLGdm/p4SKWjPDSTzLst5o6X+ rjudKDzfs26NsPoMMe6M2JNU4aVB0S7Vj8CS9Bpd77j9vOmwPXFUOcrMUqF2+l9r slpLxLGKaTcg0WmrywwNi2T31RieQRQFNReKEQx1PH6ljv5feSCRMppIqRq2ZSv9 +29VciSPwPhXtNba7S0w4tW7LJG69aLoH5Iw1V+VRgutsnHkZ2rzZv49doXN0xh2 MAGmWDcCegpYUTqmXf6lWBK6nZGXhTB11bafYV5O2hK4yu2rMDFMJk3enZY28HPJ 6Fen23Z1S0BscMzBxMtC6Ui2tkMxNcSF3WaeY9xUnO85H6KAe1YMO7AIzVJkllpv Al/Ku+1NZWN5rvErrRvuahwxJ9wFMVmNnR0pOsFcsSykZdTTntB1ahMeicGSYUP+ 8nobx4IunRNQ0isC/mvZN/2GHIqwjcyvKSCViClP8zlf80x8FqPF6umAmWVH/1d2 keADTl3a8KP7Uw6xGSt6LgwwydwZyjlDjEwpV9MVHuifeUF/Ejoelr7ghWP9XN0R fwz/wcMDGRfEYfJZaqtH =nGea -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=90029edadd35fc2a61f812c34f9374c338ce8016 Target: e941690b242b0cbf63baed95d067eaf94a231165 Author: David Soria Parra d...@php.net Wed, 20 Mar 2013 15:09:27 +0100 Parents: 87c05c1d337714941585d70bf81fd919d3eb5c50 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e941690b242b0cbf63baed95d067eaf94a231165 Target log: PHP-5.5.0beta1 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: Fix #48358 add() method for SplDoublyLinkedLis: NEWS ext/spl/spl_dllist.c ext/spl/tests/SplDoublyLinkedList_add_invalid_offset.phpt ext/spl/tests/SplDoublyLinkedList_add_missing
Commit:42574690795937290a4ad6d319f917c077542953
Author:Mark Baker mba...@inviqa.com Mon, 18 Mar 2013 22:01:42
+0100
Committer: David Soria Parra d...@php.net Tue, 19 Mar 2013 14:46:21 +0100
Parents: 4837bdb91049e47e0c15873a2d1d4d1f7a4c65d2
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=42574690795937290a4ad6d319f917c077542953
Log:
Fix #48358 add() method for SplDoublyLinkedLis
Bugs:
https://bugs.php.net/48358
Changed paths:
M NEWS
M ext/spl/spl_dllist.c
A ext/spl/tests/SplDoublyLinkedList_add_invalid_offset.phpt
A ext/spl/tests/SplDoublyLinkedList_add_missing_parameter1.phpt
A ext/spl/tests/SplDoublyLinkedList_add_missing_parameter2.phpt
A ext/spl/tests/SplDoublyLinkedList_add_null_offset.phpt
A ext/spl/tests/dllist_013.phpt
diff --git a/NEWS b/NEWS
index 2ea5117..805a40d 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,10 @@ PHP
NEWS
(Gustavo, Derick, Anatol)
. Fixed bug #62852 (Unserialize Invalid Date causes crash). (Anatol)
+- SPL:
+ . Implement FR #48358 (Add SplDoublyLinkedList::add() to insert an element
+at a given offset). (Mark Baker, David Soria Parra)
+
07 Mar 2013, PHP 5.5.0 Alpha 6
- Core:
diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
index a7f15d0..3ac2201 100644
--- a/ext/spl/spl_dllist.c
+++ b/ext/spl/spl_dllist.c
@@ -794,7 +794,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetGet)
intern = (spl_dllist_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
index = spl_offset_convert_to_long(zindex TSRMLS_CC);
-if (index 0 || index = intern-llist-count) {
+ if (index 0 || index = intern-llist-count) {
zend_throw_exception(spl_ce_OutOfRangeException, Offset
invalid or out of range, 0 TSRMLS_CC);
return;
}
@@ -881,9 +881,9 @@ SPL_METHOD(SplDoublyLinkedList, offsetUnset)
intern = (spl_dllist_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
index = spl_offset_convert_to_long(zindex TSRMLS_CC);
-llist = intern-llist;
+ llist = intern-llist;
-if (index 0 || index = intern-llist-count) {
+ if (index 0 || index = intern-llist-count) {
zend_throw_exception(spl_ce_OutOfRangeException, Offset out of
range, 0 TSRMLS_CC);
return;
}
@@ -1138,7 +1138,7 @@ SPL_METHOD(SplDoublyLinkedList, serialize)
spl_dllist_object *intern =
(spl_dllist_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
smart_str buf = {0};
spl_ptr_llist_element *current = intern-llist-head, *next;
-zval *flags;
+ zval *flags;
php_serialize_data_t var_hash;
if (zend_parse_parameters_none() == FAILURE) {
@@ -1234,6 +1234,61 @@ error:
} /* }}} */
+/* {{{ proto void SplDoublyLinkedList::add(mixed $index, mixed $newval) U
+ Inserts a new entry before the specified $index consisting of $newval. */
+SPL_METHOD(SplDoublyLinkedList, add)
+{
+ zval *zindex, *value;
+ spl_dllist_object *intern;
+ spl_ptr_llist_element *element;
+ long index;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, zz, zindex,
value) == FAILURE) {
+ return;
+ }
+ SEPARATE_ARG_IF_REF(value);
+
+ intern = (spl_dllist_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
+ index = spl_offset_convert_to_long(zindex TSRMLS_CC);
+
+ if (index 0 || index intern-llist-count) {
+ zend_throw_exception(spl_ce_OutOfRangeException, Offset
invalid or out of range, 0 TSRMLS_CC);
+ return;
+ }
+
+ if (index == intern-llist-count) {
+ /* If index is the last entry+1 then we do a push because we're
not inserting before any entry */
+ spl_ptr_llist_push(intern-llist, value TSRMLS_CC);
+ } else {
+ /* Get the element we want to insert before */
+ element = spl_ptr_llist_offset(intern-llist, index,
intern-flags SPL_DLLIST_IT_LIFO);
+
+ /* Create the new element we want to insert */
+ spl_ptr_llist_element *elem =
emalloc(sizeof(spl_ptr_llist_element));
+
+ elem-data = value;
+ elem-rc = 1;
+ /* connect to the neighbours */
+ elem-next = element;
+ elem-prev = element-prev;
+
+ /* connect the neighbours to this new element */
+ if (elem-prev == NULL) {
+ intern-llist-head = elem;
+ } else {
+ element-prev-next = elem;
+ }
+ element-prev = elem;
+
+ intern-llist-count++;
+
+ if (intern-llist-ctor) {
+ intern-llist-ctor(elem
[PHP-CVS] com php-src: Fix typos: main/php_ini.c
Commit:c6f6bf88d8c660f7dcb412b0d5049d376e3a5d36 Author:Carson McDonald car...@ioncannon.net Tue, 12 Mar 2013 04:15:50 -0400 Committer: David Soria Parra d...@php.net Tue, 19 Mar 2013 15:11:34 +0100 Parents: 7687b8b81c599b0374cb902e9dd812d2cfc12efd Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c6f6bf88d8c660f7dcb412b0d5049d376e3a5d36 Log: Fix typos Changed paths: M main/php_ini.c Diff: diff --git a/main/php_ini.c b/main/php_ini.c index b15a384..bceb6e5 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -290,7 +290,7 @@ static void php_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_t is_special_section = 1; has_per_dir_config = 1; - /* make the path lowercase on Windows, for case insensitivty. Does nothign for other platforms */ + /* make the path lowercase on Windows, for case insensitivity. Does nothing for other platforms */ TRANSLATE_SLASHES_LOWER(key); /* HOST sections */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: main/php_ini.c
Commit:c542e969f276cf6531383cfe71e76337407a3b2f Author:David Soria Parra d...@php.net Tue, 19 Mar 2013 15:11:48 +0100 Parents: ce04268bb9de5eb1c6f7794889ae5661d2c87b91 c6f6bf88d8c660f7dcb412b0d5049d376e3a5d36 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c542e969f276cf6531383cfe71e76337407a3b2f Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fix typos Changed paths: MM main/php_ini.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: ZO+ NEWS: NEWS
Commit:60b36a681986c754a925daa7142e28b450f85c38 Author:David Soria Parra d...@php.net Tue, 19 Mar 2013 15:26:40 +0100 Parents: 25b84546a8a0ecb21df2e9a9531913fca66c318c Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=60b36a681986c754a925daa7142e28b450f85c38 Log: ZO+ NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 805a40d..c8b70ef 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ PHP NEWS ?? ??? 20??, PHP 5.5.0 Beta 1 - Core: + . Added Zend Optimizer+ extension and enable it by default. More details here: +https://wiki.php.net/rfc/optimizerplus. (Dmitry) . Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail). (Laruence) . Added support for changing the process's title in CLI/CLI-Server SAPIs. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Refer to Zend Optimizer as Zend Opcache from now on: NEWS
Commit:5e55c6d9fd5cd69fa67296cd6371d81812b98f2a Author:David Soria Parra d...@php.net Tue, 19 Mar 2013 16:15:54 +0100 Parents: 60b36a681986c754a925daa7142e28b450f85c38 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5e55c6d9fd5cd69fa67296cd6371d81812b98f2a Log: Refer to Zend Optimizer as Zend Opcache from now on Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index c8b70ef..ef2fc8f 100644 --- a/NEWS +++ b/NEWS @@ -3,7 +3,7 @@ PHP NEWS ?? ??? 20??, PHP 5.5.0 Beta 1 - Core: - . Added Zend Optimizer+ extension and enable it by default. More details here: + . Added Zend Opcache extension and enable it by default. More details here: https://wiki.php.net/rfc/optimizerplus. (Dmitry) . Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail). (Laruence) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: ZO+ NEWS: NEWS
On 03/19/2013 07:37 PM, Stas Malyshev wrote: Hi! - Core: + . Added Zend Optimizer+ extension and enable it by default. More details here: +https://wiki.php.net/rfc/optimizerplus. (Dmitry) I think building it is enabled by default, but extension itself isn't? Am I wrong? Yes thats true. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: use NEWS only: NEWS-5.5
Commit:6824dc6b333c69384677d6f37c48d7f57228de13 Author:David Soria Parra d...@php.net Fri, 8 Mar 2013 11:12:35 +0100 Parents: 01049ca7aed40a5f1081d0303c69a40dae0f982e Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6824dc6b333c69384677d6f37c48d7f57228de13 Log: use NEWS only Changed paths: D NEWS-5.5 diff --git a/NEWS-5.5 b/NEWS-5.5 deleted file mode 100644 index d5acd61..000 --- a/NEWS-5.5 +++ /dev/null @@ -1,345 +0,0 @@ -PHPNEWS -||| -?? ??? 201?, PHP 5.5.0 Beta 1 - -- Core: - . Fixed bug #61025 (__invoke() visibility not honored). (Laruence) - . Fixed bug #49348 (Uninitialized ++$foo-bar; does not cause a notice). -(Stas) - -- Sockets: - . Fixed bug #64287 (sendmsg/recvmsg shutdown handler causes segfault). -(Gustavo) - -- PCRE: - . Merged PCRE 8.32. (Anatol) - -21 Feb 2013, PHP 5.5.0 Alpha 5 - -- Core: - . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell) - . Fixed bug #64135 (Exceptions from set_error_handler are not always -propagated). (Laruence) - . Fixed bug #63830 (Segfault on undefined function call in nested generator). -(Nikita Popov) - . Fixed bug #60833 (self, parent, static behave inconsistently -case-sensitive). (Stas, mario at include-once dot org) - . Implemented FR #60524 (specify temp dir by php.ini). (ALeX Kazik). - . Fixed bug #64142 (dval to lval different behavior on ppc64). (Remi) - . Added ARMv7/v8 versions of various Zend arithmetic functions that are -implemented using inline assembler (Ard Biesheuvel) - . Fix undefined behavior when converting double variables to integers. -The double is now always rounded towards zero, the remainder of its division - by 2^32 or 2^64 (depending on sizeof(long)) is calculated and it's made - signed assuming a two's complement representation. (Gustavo) - -- CLI server: - . Fixed bug #64128 (buit-in web server is broken on ppc64). (Remi) - -- cURL: - . Implemented FR #46439 - added CURLFile for safer file uploads. -(Stas) - -- Intl: - . Cherry-picked UConverter wrapper, which had accidentaly been committed only -to master. - -- mysqli - . Added mysqli_begin_transaction()/mysqli::begin_transaction(). Implemented -all options, per MySQL 5.6, which can be used with START TRANSACTION, COMMIT - and ROLLBACK through options to mysqli_commit()/mysqli_rollback() and their - respective OO counterparts. They work in libmysql and mysqlnd mode. (Andrey) - . Added mysqli_savepoint(), mysqli_release_savepoint(). (Andrey) - -- mysqlnd - . Add new begin_transaction() call to the connection object. Implemented all -options, per MySQL 5.6, which can be used with START TRANSACTION, COMMIT - and ROLLBACK. (Andrey) - . Added mysqlnd_savepoint(), mysqlnd_release_savepoint(). (Andrey) - -- Sockets: - . Added recvmsg() and sendmsg() wrappers. (Gustavo) -See https://wiki.php.net/rfc/sendrecvmsg - -- Filter: - . Implemented FR #49180 - added MAC address validation. (Martin) - -- Phar: - . Fixed timestamp update on Phar contents modification. (Dmitry) - -- SPL: - . 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). -(Nikita Popov) - . Fixed bug #52861 (unset fails with ArrayObject and deep arrays). -(Mike Willbanks) - -- SNMP: - . Fixed bug #64124 (IPv6 malformed). (Boris Lytochkin) - -24 Jan 2013, PHP 5.5.0 Alpha 4 - -- Core: - . Fixed bug #63980 (object members get trimmed by zero bytes). (Laruence) - . Implemented RFC for Class Name Resolution As Scalar Via class Keyword. -(Ralph Schindler, Nikita Popov, Lars) - -- DateTime - . Added DateTimeImmutable - a variant of DateTime that only returns the -modified state instead of changing itself. (Derick) - -- FPM: - . Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam) - -- pgsql: - . Bug #46408: Locale number format settings can cause pg_query_params to -break with numerics. (asmecher, Lars) - -- dba: - . Bug #62489: dba_insert not working as expected. -(marc-bennewitz at arcor dot de, Lars) - -- Reflection: - . Fixed bug #64007 (There is an ability to create instance of Generator by -hand). (Laruence) - -10 Jan 2013, PHP 5.5.0 Alpha 3 - -- General improvements: - . Fixed bug #63874 (Segfault if php_strip_whitespace has heredoc). (Pierrick) - . Fixed bug #63822 (Crash when using closures with ArrayAccess). -(Nikita Popov) - . Add Generator::throw() method. (Nikita Popov) - . Bug #23955: allow specifying Max-Age attribute in setcookie() (narfbg, Lars) - . Bug #52126: timestamp for mail.log (Martin Jansen, Lars
[PHP-CVS] tag php-src: update tag php-5.5.0beta1
Tag php-5.5.0beta1 in php-src.git was updated from 401261a0aa11c29c2210a77a3a6a042a8200ea0b Link: http://git.php.net/?p=php-src.git;a=tag;h=e76c3b76ef530dfc763374252a7ff90d8828a945 Target: e76c3b76ef530dfc763374252a7ff90d8828a945 Author: David Soria Parra d...@php.net Wed, 6 Mar 2013 23:56:09 +0100 Parents: b6ae7cba1ec4f999602241e690d2e5cc13ec4120 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e76c3b76ef530dfc763374252a7ff90d8828a945 Target log: PHP 5.5.0 Beta 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] tag php-src: delete tag php-5.5.0beta1
Tag php-5.5.0beta1 in php-src.git was deleted from e76c3b76ef530dfc763374252a7ff90d8828a945 -- 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.0alpha6
Tag php-5.5.0alpha6 in php-src.git was created Link: http://git.php.net/?p=php-src.git;a=tag;h=437f4b193310bdf8bc2c37ffb0f54a9b6ede28eb Target: 437f4b193310bdf8bc2c37ffb0f54a9b6ede28eb Author: David Soria Parra d...@php.net Thu, 7 Mar 2013 12:15:40 +0100 Parents: d0ca2430da5a79af8781126aa3b16488dde41671 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=437f4b193310bdf8bc2c37ffb0f54a9b6ede28eb Target log: PHP 5.5.0 Alpha 6 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 next beta: NEWS
Commit:e98271f588e60e8dbe29c964357a7022e78db696 Author:David Soria Parra d...@php.net Thu, 7 Mar 2013 12:14:48 +0100 Parents: d0ca2430da5a79af8781126aa3b16488dde41671 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e98271f588e60e8dbe29c964357a7022e78db696 Log: News for next beta Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 0d9c242..a82e9a2 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ PHPNEWS ||| +?? ??? 20??, PHP 5.5.0 Beta 1 + + 07 Mar 2013, PHP 5.5.0 Alpha 6 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Do another Alpha instead of Beta because of ZO+ RFC being voted on: NEWS
Commit:d0ca2430da5a79af8781126aa3b16488dde41671 Author:David Soria Parra d...@php.net Thu, 7 Mar 2013 12:14:26 +0100 Parents: 4923bb579aba94e0a6ff6d23e2320daba52f762c Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d0ca2430da5a79af8781126aa3b16488dde41671 Log: Do another Alpha instead of Beta because of ZO+ RFC being voted on Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 74fda06..0d9c242 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,6 @@ PHPNEWS ||| -?? ??? 20??, PHP 5.5.0 Beta 2 - -07 Mar 2013, PHP 5.5.0 Beta 1 +07 Mar 2013, PHP 5.5.0 Alpha 6 - Core: . Fixed bug #49348 (Uninitialized ++$foo-bar; does not cause a notice). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: NEWS for the next beta: NEWS
Commit:4923bb579aba94e0a6ff6d23e2320daba52f762c Author:David Soria Parra d...@php.net Wed, 6 Mar 2013 23:51:27 +0100 Parents: b6ae7cba1ec4f999602241e690d2e5cc13ec4120 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4923bb579aba94e0a6ff6d23e2320daba52f762c Log: NEWS for the next beta Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index c00c0c5..74fda06 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 20??, PHP 5.5.0 Beta 2 + 07 Mar 2013, PHP 5.5.0 Beta 1 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: NEWS for PHP 5.5.0 Beta 1: NEWS
Commit:b6ae7cba1ec4f999602241e690d2e5cc13ec4120 Author:David Soria Parra d...@php.net Wed, 6 Mar 2013 22:39:54 +0100 Parents: 8589dfb6cce4de3c13456486760c5d9e3dbc3b43 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b6ae7cba1ec4f999602241e690d2e5cc13ec4120 Log: NEWS for PHP 5.5.0 Beta 1 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 6ac8418..c00c0c5 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 201?, PHP 5.5.0 Beta 1 +07 Mar 2013, PHP 5.5.0 Beta 1 - Core: . Fixed bug #49348 (Uninitialized ++$foo-bar; does not cause a notice). -- 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.0beta1
Tag php-5.5.0beta1 in php-src.git was created Link: http://git.php.net/?p=php-src.git;a=tag;h=401261a0aa11c29c2210a77a3a6a042a8200ea0b Target: 401261a0aa11c29c2210a77a3a6a042a8200ea0b Author: David Soria Parra d...@php.net Wed, 6 Mar 2013 23:56:09 +0100 Parents: b6ae7cba1ec4f999602241e690d2e5cc13ec4120 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=401261a0aa11c29c2210a77a3a6a042a8200ea0b Target log: PHP 5.5.0 Beta 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] tag php-src: create tag php-5.5.0alpha5
Tag php-5.5.0alpha5 in php-src.git was created Tag: c27980e6b750f2de368f9e940ec28f3be6a5cf63 Tagger: David Soria Parrad...@php.net Tue Feb 19 19:33:24 2013 +0100 Log: PHP 5.5.0 Alpha 5 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJRI8V4AAoJEME8cLhyZ7UtI/wQAI7k2mXYdyQRFbiFq9pbw/7x b4yAqqJFNMNx2+n5RZ1eJ0Foo1J6NWrZhYENDg0oGAKJNuTH+rtgcYWc5ubRatcx 9c902xHDb1W7ew/zWsuRDVZ5IfnyUSUSh8lMuIiNo4GORwaj6MuuSL5w+8Z8v1VE d0NAzk3cIDjhHAfHpWTxb72ZGERK9XVAoUZ2jAJuJ4OJZgnTXkMAvEEmFKGBaH9T 4LsCrwQoQS5ryzQlzfx6ZJ5ChDFvmApTM5hw/bkRXj18XiiZq0tACKw8WanX3inc KUsQO9DXdDHGYwRoFTn85JwciT6POvtzQ+NzYqgk9utkfBQb+1TbXD+8EGTL1urE Q/WEnunSFvjEuW6oQJUKxYIHO/bcMmwNA58/bbUjiL8Fn+/SsLGV7+DL10+TNAvr blXDg4LTvZIY9eLWU9owTasDnfd35g/3U/dVjuX0nI0tqcchB3Z6RSk520qKgUU0 LKlV4g1w0nJmL1dFWN0VzglQ1bCYKKBaWtx+EWcSY8KVQSZwToM/UhlYhDImu674 FBXtAPR9UDu/M115gZYJQYkMXluD7LDVgWlS/Pum6zFH4JhsYBbphXRY7i5USggs qsbmqj8w2I+PLaurlD8dCM0AUKkCNrn5iJx+xh1GIicwIrrHkuO7uRXUGeP3DLPp T/C+OFhCXHmGMxAyc6uZ =lHI2 -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=c27980e6b750f2de368f9e940ec28f3be6a5cf63 Target: e926a1a71b17555c621b7f193bcd6625c916de48 Author: David Soria Parra d...@php.net Tue, 19 Feb 2013 19:30:46 +0100 Parents: c3931bdfb314a6011171dfe17825bbe7cdf5cc7f Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e926a1a71b17555c621b7f193bcd6625c916de48 Target log: PHP 5.5.0alpha5 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 PHP 5.5.0 Alpha 5: NEWS
Commit:c3931bdfb314a6011171dfe17825bbe7cdf5cc7f Author:David Soria Parra d...@php.net Tue, 19 Feb 2013 19:26:33 +0100 Parents: d77eb411ea5d80379ee92a908f543b91fa293383 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c3931bdfb314a6011171dfe17825bbe7cdf5cc7f Log: News for PHP 5.5.0 Alpha 5 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 2cabbbe..d67ffb4 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 201?, PHP 5.5.0 Beta 1 +21 Feb 2013, PHP 5.5.0 Alpha 5 - Core: . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Start new NEWS section for beta1: NEWS
Commit:7e5f761e82628f4710637226c6cad68ebe1b7445 Author:David Soria Parra d...@php.net Tue, 19 Feb 2013 19:42:27 +0100 Parents: a4bcc15c3b260c2b7410e8b5657ab15d3051ef54 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7e5f761e82628f4710637226c6cad68ebe1b7445 Log: Start new NEWS section for beta1 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index d67ffb4..d6ff8c4 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 201?, PHP 5.5.0 Beta 1 + 21 Feb 2013, PHP 5.5.0 Alpha 5 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: News for PHP 5.5.0 Alpha 5: NEWS
Commit:a4bcc15c3b260c2b7410e8b5657ab15d3051ef54 Author:David Soria Parra d...@php.net Tue, 19 Feb 2013 19:26:33 +0100 Parents: 43664e656d8ba30f11a08da165b33c0cb9be81a1 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a4bcc15c3b260c2b7410e8b5657ab15d3051ef54 Log: News for PHP 5.5.0 Alpha 5 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 2cabbbe..d67ffb4 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 201?, PHP 5.5.0 Beta 1 +21 Feb 2013, PHP 5.5.0 Alpha 5 - Core: . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
dsp Sun, 03 Feb 2013 10:43:58 + Revision: http://svn.php.net/viewvc?view=revisionrevision=329400 Log: give tyrael access to web/jenkins.git Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2013-02-02 18:33:09 UTC (rev 329399) +++ SVNROOT/global_avail2013-02-03 10:43:58 UTC (rev 329400) @@ -401,6 +401,9 @@ # Our bundled version of bindlib (used by php on windows) avail|auroraeosrose,scottmac,pajoye,edin|php/bindlib_w32 +# jenkins karma +avail|tyrael|web/jenkins.git + # bugtracker karma avail|bcarlyon,derick|web/bugtracker -- 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.0alpha4
Tag php-5.5.0alpha4 in php-src.git was created Tag: f9ca11347acf6c2edc5b2069052f1994ee989d10 Tagger: David Soria Parrad...@php.net Tue Jan 22 09:43:28 2013 +0100 Log: PHP 5.5.0 Alpha 4 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJQ/lE0AAoJEME8cLhyZ7Ut9u4QAIWHkLDOQSLSgAdkwsAKdm5C S/BvTSAz0k6ZHiJDSygyM1schUOuuz1OKyAwoOZjnyWSziTNZoIBfUyaZ/OiniF7 It8SqUBbsJ+2RrDZeNECKd3RuizAz76v8XdxHinvpIN1poC/lYtBqllcNEkLV36M hd4nAfbe1HCsrYTIN1+V9Hzpu7dmIC4Vrsy/ryuZ0w8AbuLpeIdYFPJ0WckWA8Bo wt3MGXFmi06IEHIQBF1rIsJl0DIcT+vYLe9JqNx/18UxdTMxLEsxPyPs+2CnJqxX R6FfF4iiB1E3Rd9n81Sx3Ft7JMiqdvo+6iQ7dBKCO3BxYwYRINXYceELgjIimZIG O/rBa7dFfc+xn9/zG5rXiv3WdlsKM1nGMfXRTPRheUf8kJBkfpi/RT52tKJMOe++ MRrdjwtkusAHedSc0JBNfmJ7EjTb2fq4qJcrUGBYIBSqwt9lFi9xT72iudUtGLyF YkOFuwtTLg4Byp6m7ykc0RaQfTdITokMLqp3dmdGb2lbHQgkhDesu0CfByvxgdJU o7wTXrGQyBkr15Zx0W9Nn8g1QPB1SjRKjDr5rJjIabqwi6boN/h6EraVIgXff0Vu 4PFUrgR52ZjeIVV3BaEnCCHZ21hgkymGH8uJz8cMWSXQEMa+CWDk02QChRMTScWu q/11EfmzHUHoqquIb22o =YLAm -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=f9ca11347acf6c2edc5b2069052f1994ee989d10 Target: 40eea49f64cc8a4fab18313ee25a872fce784a15 Author: David Soria Parra d...@php.net Tue, 22 Jan 2013 09:40:55 +0100 Parents: ca734cfbc7ef9f0738fa6ed3ba88fe611528881b Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=40eea49f64cc8a4fab18313ee25a872fce784a15 Target log: PHP 5.5.0 Alpha 4 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 PHP 5.5.0alpha4: NEWS
Commit:ca734cfbc7ef9f0738fa6ed3ba88fe611528881b Author:David Soria Parra d...@php.net Tue, 22 Jan 2013 09:37:02 +0100 Parents: 03ff2b301ceb28f74d2ed965e14a0cf716e14d27 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ca734cfbc7ef9f0738fa6ed3ba88fe611528881b Log: NEWS for PHP 5.5.0alpha4 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 656..c93f328 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 201?, PHP 5.5.0 Alpha 4 +24 Jan 2013, PHP 5.5.0 Alpha 4 - Core: . Fixed bug #63980 (object members get trimmed by zero bytes). (Laruence) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: NEWS: Start PHP 5.5.0 Beta 1 section: NEWS
Commit:51e5022364228fb55753902ea3ee63c27661e02c Author:David Soria Parra d...@php.net Tue, 22 Jan 2013 09:45:04 +0100 Parents: ca734cfbc7ef9f0738fa6ed3ba88fe611528881b Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=51e5022364228fb55753902ea3ee63c27661e02c Log: NEWS: Start PHP 5.5.0 Beta 1 section Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index c93f328..a8747f5 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ PHPNEWS ||| +?? ??? 201?, PHP 5.5.0 Beta 1 + + 24 Jan 2013, PHP 5.5.0 Alpha 4 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix NEWS: NEWS
Commit:03ff2b301ceb28f74d2ed965e14a0cf716e14d27 Author:David Soria Parra d...@php.net Tue, 22 Jan 2013 09:35:24 +0100 Parents: 92b5bdc231ede3879df048d9ba061d2369c3102e Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=03ff2b301ceb28f74d2ed965e14a0cf716e14d27 Log: Fix NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 89fcad3..656 100644 --- a/NEWS +++ b/NEWS @@ -1,32 +1,12 @@ PHPNEWS ||| -?? ??? 201?, PHP 5.5.0 Alpha 3 +?? ??? 201?, PHP 5.5.0 Alpha 4 - Core: . Fixed bug #63980 (object members get trimmed by zero bytes). (Laruence) . Implemented RFC for Class Name Resolution As Scalar Via class Keyword. (Ralph Schindler, Nikita Popov, Lars) -- General improvements: - . Fixed bug #63874 (Segfault if php_strip_whitespace has heredoc). (Pierrick) - . Fixed bug #63822 (Crash when using closures with ArrayAccess). -(Nikita Popov) - . Add Generator::throw() method. (Nikita Popov) - . Bug #23955: allow specifying Max-Age attribute in setcookie() (narfbg, Lars) - . Bug #52126: timestamp for mail.log (Martin Jansen, Lars) - -- mysqlnd - . Fixed return value of mysqli_stmt_affected_rows() in the time after -prepare() and before execute(). (Andrey) - -- cURL: - . Added new functions curl_escape, curl_multi_setopt, curl_multi_strerror -curl_pause, curl_reset, curl_share_close, curl_share_init, - curl_share_setopt curl_strerror and curl_unescape. (Pierrick) - . Addes new curl options CURLOPT_TELNETOPTIONS, CURLOPT_GSSAPI_DELEGATION, -CURLOPT_ACCEPTTIMEOUT_MS, CURLOPT_SSL_OPTIONS, CURLOPT_TCP_KEEPALIVE, - CURLOPT_TCP_KEEPIDLE and CURLOPT_TCP_KEEPINTVL. (Pierrick) - - DateTime . Added DateTimeImmutable - a variant of DateTime that only returns the modified state instead of changing itself. (Derick) @@ -46,6 +26,28 @@ PHP NEWS . Fixed bug #64007 (There is an ability to create instance of Generator by hand). (Laruence) +10 Jan 2013, PHP 5.5.0 Alpha 3 + +- General improvements: + . Fixed bug #63874 (Segfault if php_strip_whitespace has heredoc). (Pierrick) + . Fixed bug #63822 (Crash when using closures with ArrayAccess). +(Nikita Popov) + . Add Generator::throw() method. (Nikita Popov) + . Bug #23955: allow specifying Max-Age attribute in setcookie() (narfbg, Lars) + . Bug #52126: timestamp for mail.log (Martin Jansen, Lars) + +- mysqlnd + . Fixed return value of mysqli_stmt_affected_rows() in the time after +prepare() and before execute(). (Andrey) + +- cURL: + . Added new functions curl_escape, curl_multi_setopt, curl_multi_strerror +curl_pause, curl_reset, curl_share_close, curl_share_init, +curl_share_setopt curl_strerror and curl_unescape. (Pierrick) + . Addes new curl options CURLOPT_TELNETOPTIONS, CURLOPT_GSSAPI_DELEGATION, +CURLOPT_ACCEPTTIMEOUT_MS, CURLOPT_SSL_OPTIONS, CURLOPT_TCP_KEEPALIVE, +CURLOPT_TCP_KEEPIDLE and CURLOPT_TCP_KEEPINTVL. (Pierrick) + 18 Dec 2012, PHP 5.5.0 Alpha 2 - General improvements: -- 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.0alpha3
Tag php-5.5.0alpha3 in php-src.git was created Tag: 715849a09358462078fcac8debd24919f7c04232 Tagger: David Soria Parrad...@php.net Thu Jan 10 01:11:16 2013 +0100 Log: PHP 5.5.0 Alpha 3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJQ7gcnAAoJEME8cLhyZ7Ut5HAP/2FaGpM6NZLFO+TltIx2YbsX DZq+17feg7XCZDrShG8sOpYI5hPOnE7RRFxkjLuBnVLVwlrxRnzDUQo6WMBqgNbm Db+qbkdDXDdmMYsZ55+RjtSr719NqA2tC+a7brOobkHNKOoRYl/ZNPPiP9aPc7we bwa2FRPugcGTEoo4ezrDyTAQsSGY8CLn553Ldnpg3s8L3UzzlquUI9JumzkPVKfz OTQHo1C5JLyaJ6JvGG+LtTbme+mtBW2rXsCP9ssxcIDm33hA1lJwv1jc5nh7m5i8 jqUBMLJJDzaHNg92fKlw0LjT33yufntYOzcTF5hlv6++WV42MuK5lbK7Td0516bH uM67TzCLhNf+JCg1iIY1RDK+QUqUcsShLqWjizXr/PbKtDqjLuRIE1eLSF77vKnj lHyOX3fin1F7E6VXLUQbx36TYvoUPetsYvoiz9okS0MS2o+VfZLE244XMjOhrUVX MXx2Mh5wiF9LkXl99gBEgGxmBsOuDufV4qzEb36TbQaf53u+WThLc9BqdbFinqy4 uz8XsRxCHyIfeRz2MQ781R2PUUMRdUOsPjlOkFSnQV/vsK+kgjV0dAY/kqJrI70u fHVnpV7Tb7bLO8vnXVb41rj7JReLBp1LuhiiaF/gUVTdtDugUkLwUUEN4XalNQ4b /mdq/puQf7X8HisbWZ75 =daM9 -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=715849a09358462078fcac8debd24919f7c04232 Target: a7c3d28e89e0617c54bf567eaca94fb8dad5dfdb Author: David Soria Parra d...@php.net Thu, 10 Jan 2013 01:11:02 +0100 Parents: 28ce2acb7a358eb3f8c9f63199c3b58eca5b0fd1 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a7c3d28e89e0617c54bf567eaca94fb8dad5dfdb Target log: NEWS for PHP 5.5.0alpha3 Changed paths: M NEWS -- 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.0alpha2
Tag php-5.5.0alpha2 in php-src.git was created Tag: 43ded1841a9853ed273f819f2091465a95d343a2 Tagger: David Soria Parrad...@php.net Tue Dec 18 16:51:13 2012 +0100 Log: PHP 5.5.0 Alpha 2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJQ0JD3AAoJEME8cLhyZ7Utes8QAKjsdavkKPvFWndbxmT/MKXA LqK8Nw3RhDuLqgAcRDdvjLxWDw2DHHgwXWuA5ZShDXejQBOlewDMgVyhCcL8g1sB GKgLN56bjJT1uWrRX9nSjhC6RHb8pzTYSO99b1oukTdUAcDEGP05yfaeXyig3S7k GQ6HoRgrjLwpX9KSSsU/Zf4I+PzKH5M3/xiiJMhTgxTLzBwDhPvsK2RQaPX4Dbi6 KZOjSJDk5sgPMq49z4XiLkT0ezB/0O7rmttakmgGj4LYJEEdJ9s2QGi2ym/zb5aQ 99px3KuzBaCrg2dlke/vShaihUagpxKnprGvUWl3i5T1wGe3aVyhlW43WofsHKo0 PVJN0yFkt0goqbjpDULyZZ94Do8xfiZIsKKca/TkaSFr5y3JLOwQ9bjBRhRhdtRM DHRyao/7numYdX72nnbpSmZm++MsWjzwA4bU+TcDHbkcLAuTjwqd/tT3m9N8aqxY j8RALz/j+fT7A6vHxYKydkJPR5B46wqiCWYH9QwNLP3esOJCzQ9JxiBAYP0XXj7E 19HvJCbYdaw9/iwyY5nCIFPzNPtNVPsRNrOscZfPwtEcA+82+D+00KwrgdWLirX5 jY2AW44BbdxU3TkZQ9Uk+Uu9qxoxaBIM8YhsrFbckzF7sWDre9w8ZgbRKfhZ3jsH uNwedrN7jlbbTU8uFVAq =uV7O -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=43ded1841a9853ed273f819f2091465a95d343a2 Target: 94eff14f26013d2be976036b288536d902b59971 Author: David Soria Parra d...@php.net Sat, 15 Dec 2012 00:15:13 +0100 Parents: 0c44998d88f83cafa0ba2f7811208b98b5efd5aa Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=94eff14f26013d2be976036b288536d902b59971 Target log: Bump version for PHP-5.5.0alpha2 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
