[PHP-CVS] [git] commit php-src.git: sapi/cli/tests/php_cli_server_016.phpt sapi/cli/tests/php_cli_server_017.phpt
Commit: 30bd2494a29c45faf7ddac37601fa2588856c7fe
Author: Xinchen Hui(larue...@gmail.com) Tue, 20 Mar 2012 15:26:58 +0800
Committer: Xinchen Hui(larue...@gmail.com) Tue, 20 Mar 2012 15:26:58 +0800
Parents: 44d948996fd51249a4451189ec8e8239b9b20034
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=30bd2494a29c45faf7ddac37601fa2588856c7fe
Log:
Use newdoc instead of escape char
Changed paths:
M sapi/cli/tests/php_cli_server_016.phpt
M sapi/cli/tests/php_cli_server_017.phpt
Diff:
30bd2494a29c45faf7ddac37601fa2588856c7fe
diff --git a/sapi/cli/tests/php_cli_server_016.phpt
b/sapi/cli/tests/php_cli_server_016.phpt
index 9732924..3fd065a 100644
--- a/sapi/cli/tests/php_cli_server_016.phpt
+++ b/sapi/cli/tests/php_cli_server_016.phpt
@@ -10,8 +10,8 @@ include skipif.inc;
--FILE--
?php
include php_cli_server.inc;
-php_cli_server_start(PHP
-if (preg_match('/\.(?:png|jpg|jpeg|gif)$/', \$_SERVER[REQUEST_URI]))
+php_cli_server_start('PHP'
+if (preg_match('/\.(?:png|jpg|jpeg|gif)$/', $_SERVER[REQUEST_URI]))
return false; // serve the requested resource as-is.
else {
echo here;
diff --git a/sapi/cli/tests/php_cli_server_017.phpt
b/sapi/cli/tests/php_cli_server_017.phpt
index 778e5f2..6c414a1 100644
--- a/sapi/cli/tests/php_cli_server_017.phpt
+++ b/sapi/cli/tests/php_cli_server_017.phpt
@@ -7,8 +7,8 @@ include skipif.inc;
--FILE--
?php
include php_cli_server.inc;
-php_cli_server_start(PHP
-var_dump(\$_SERVER['SCRIPT_FILENAME']);
+php_cli_server_start('PHP'
+var_dump($_SERVER['SCRIPT_FILENAME']);
PHP
);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: a0d149bc50e2f78352f05a40fa5e478cf56e4803 Author: Xinchen Hui(larue...@gmail.com) Tue, 20 Mar 2012 15:27:41 +0800 Committer: Xinchen Hui(larue...@gmail.com) Tue, 20 Mar 2012 15:27:41 +0800 Parents: eda790de0fbd5e7454c2efd5dc33a575bec9631f 30bd2494a29c45faf7ddac37601fa2588856c7fe Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a0d149bc50e2f78352f05a40fa5e478cf56e4803 Log: Merge branch 'PHP-5.4' * PHP-5.4: Use newdoc instead of escape char adapt makedist to git Changed paths: Diff: a0d149bc50e2f78352f05a40fa5e478cf56e4803 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: 1a42558832f729bdd59934b322aced68596d8173 Author: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 15:42:25 +0800 Committer: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 15:42:25 +0800 Parents: a0d149bc50e2f78352f05a40fa5e478cf56e4803 e1931dd1ad35d46e1858a6571e16ed592c43f338 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a42558832f729bdd59934b322aced68596d8173 Log: Merge branch 'PHP-5.4' * PHP-5.4: Minor change, test using php mail address as account Changed paths: Diff: 1a42558832f729bdd59934b322aced68596d8173 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git: sapi/cli/tests/php_cli_server.inc
Commit: e1931dd1ad35d46e1858a6571e16ed592c43f338
Author: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 15:41:43 +0800
Committer: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 15:41:43 +0800
Parents: 30bd2494a29c45faf7ddac37601fa2588856c7fe
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=e1931dd1ad35d46e1858a6571e16ed592c43f338
Log:
Minor change, test using php mail address as account
Changed paths:
M sapi/cli/tests/php_cli_server.inc
Diff:
e1931dd1ad35d46e1858a6571e16ed592c43f338
diff --git a/sapi/cli/tests/php_cli_server.inc
b/sapi/cli/tests/php_cli_server.inc
index 60ae325..44ee76e 100644
--- a/sapi/cli/tests/php_cli_server.inc
+++ b/sapi/cli/tests/php_cli_server.inc
@@ -5,6 +5,7 @@ function php_cli_server_start($code = 'echo Hello world;',
$no_router = FALSE)
$php_executable = getenv('TEST_PHP_EXECUTABLE');
$doc_root = __DIR__;
$router = index.php;
+
if ($code) {
file_put_contents($doc_root . '/' . $router, '?php ' . $code .
' ?');
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git: .gitignore
Commit: 868dbe127ac12586e5fc6a8e3514eb5007477fee Author: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 15:59:17 +0800 Committer: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 15:59:17 +0800 Parents: e1931dd1ad35d46e1858a6571e16ed592c43f338 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=868dbe127ac12586e5fc6a8e3514eb5007477fee Log: Ignore the temporay files in sapi/*/tests/ Changed paths: M .gitignore Diff: 868dbe127ac12586e5fc6a8e3514eb5007477fee diff --git a/.gitignore b/.gitignore index f104329..f295248 100644 --- a/.gitignore +++ b/.gitignore @@ -114,11 +114,19 @@ main/php_config.h.in */tests/*.php */tests/*.exp */tests/*.log +*/tests/*.sh */tests/*/*.diff */tests/*/*.out */tests/*/*.php */tests/*/*.exp */tests/*/*.log +*/tests/*/*.sh +*/*/tests/*.diff +*/*/tests/*.out +*/*/tests/*.php +*/*/tests/*.exp +*/*/tests/*.log +*/*/tests/*.sh # Extension specifc ignores ext/*/configure.in -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: 4b6772f847f460a512de6f230c8bfdf866253eb2 Author: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 16:00:21 +0800 Committer: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 16:00:21 +0800 Parents: 1a42558832f729bdd59934b322aced68596d8173 868dbe127ac12586e5fc6a8e3514eb5007477fee Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4b6772f847f460a512de6f230c8bfdf866253eb2 Log: Merge branch 'PHP-5.4' * PHP-5.4: Ignore the temporay files in sapi/*/tests/ Changed paths: Diff: 4b6772f847f460a512de6f230c8bfdf866253eb2 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git: .gitignore
Commit: bcd19cf6491030f3bfd14d769011ba8f20d99333 Author: Sebastian Bergmann(s...@sebastian-bergmann.de) Mon, 19 Mar 2012 18:25:37 +0100 Committer: Sebastian Bergmann(s...@sebastian-bergmann.de) Mon, 19 Mar 2012 18:25:37 +0100 Parents: 887ee455dc2059a3154ee1173e2b973932067743 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bcd19cf6491030f3bfd14d769011ba8f20d99333 Log: Add missing files. Changed paths: M .gitignore Diff: bcd19cf6491030f3bfd14d769011ba8f20d99333 diff --git a/.gitignore b/.gitignore index ce6f9d6..f104329 100644 --- a/.gitignore +++ b/.gitignore @@ -94,6 +94,19 @@ want_dependencies x64 stamp-h.in scan_makefile_in.awk +TSRM/tsrm_config.h +Zend/zend_config.h +Zend/zend_ini_parser.c +Zend/zend_ini_parser.h +Zend/zend_ini_parser.output +Zend/zend_language_parser.c +Zend/zend_language_parser.h +Zend/zend_language_parser.output +ext/date/lib/timelib_config.h +ext/iconv/php_iconv_aliased_libiconv.h +ext/phar/phar.php +main/php_config.h +main/php_config.h.in # Test specific Ignores */tests/*.diff -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: 5bfd8920a2782e8347bcf15a4a702b0213b165f6 Author: Sebastian Bergmann(s...@sebastian-bergmann.de) Mon, 19 Mar 2012 18:25:49 +0100 Committer: Sebastian Bergmann(s...@sebastian-bergmann.de) Mon, 19 Mar 2012 18:25:49 +0100 Parents: 53e3467ff233af4a40626f86ea8a61880722beb8 bcd19cf6491030f3bfd14d769011ba8f20d99333 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5bfd8920a2782e8347bcf15a4a702b0213b165f6 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: Diff: 5bfd8920a2782e8347bcf15a4a702b0213b165f6 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: ae5e8ad9c3e1594bdd56db302347e34456c9478c Author: Sebastian Bergmann(s...@sebastian-bergmann.de) Mon, 19 Mar 2012 18:26:01 +0100 Committer: Sebastian Bergmann(s...@sebastian-bergmann.de) Mon, 19 Mar 2012 18:26:01 +0100 Parents: dea5376644d01bcecec1c5afaca07948b65f577f 5bfd8920a2782e8347bcf15a4a702b0213b165f6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ae5e8ad9c3e1594bdd56db302347e34456c9478c Log: Merge branch 'PHP-5.4' Changed paths: Diff: ae5e8ad9c3e1594bdd56db302347e34456c9478c -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: f5f5ca5d77cfe47b9556b3cc37fbf9605b822e5c Author: Gustavo André dos Santos Lopes(cataphr...@php.net) Mon, 19 Mar 2012 17:50:13 + Committer: Gustavo André dos Santos Lopes(cataphr...@php.net) Mon, 19 Mar 2012 17:50:13 + Parents: cfdd6c5788afc6fb907f6f518dceab4fd82c922e 5bfd8920a2782e8347bcf15a4a702b0213b165f6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f5f5ca5d77cfe47b9556b3cc37fbf9605b822e5c Log: Merge branch 'PHP-5.4' of git.php.net:/php-src into 5.4 Changed paths: Diff: f5f5ca5d77cfe47b9556b3cc37fbf9605b822e5c -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git: ext/standard/html.c
Commit: cfdd6c5788afc6fb907f6f518dceab4fd82c922e
Author: Gustavo André dos Santos Lopes(cataphr...@php.net) Sun, 5 Feb
2012 14:57:57 +
Committer: Gustavo André dos Santos Lopes(cataphr...@php.net) Mon, 19 Mar
2012 16:36:21 +
Parents: 9a460497da3cc2b755f4628350756427fc0a1051
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=cfdd6c5788afc6fb907f6f518dceab4fd82c922e
Log:
MFH: 7dcada1 for 5.4
- Fixed possible unsigned int wrap around in html.c. Note that 5.3 has the same
(potential) problem; even though the code is substantially different, the
variable name and the fashion it was incremented was kept.
Changed paths:
M ext/standard/html.c
Diff:
cfdd6c5788afc6fb907f6f518dceab4fd82c922e
diff --git a/ext/standard/html.c b/ext/standard/html.c
index 5b47a83..65e63f4 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -1258,9 +1258,13 @@ PHPAPI char *php_escape_html_entities_ex(unsigned char
*old, size_t oldlen, size
maxlen = 128;
} else {
maxlen = 2 * oldlen;
+ if (maxlen oldlen) {
+ zend_error_noreturn(E_ERROR, Input string is too
long);
+ return NULL;
+ }
}
- replaced = emalloc(maxlen + 1);
+ replaced = emalloc(maxlen + 1); /* adding 1 is safe: maxlen is even */
len = 0;
cursor = 0;
while (cursor oldlen) {
@@ -1272,8 +1276,9 @@ PHPAPI char *php_escape_html_entities_ex(unsigned char
*old, size_t oldlen, size
/* guarantee we have at least 40 bytes to write.
* In HTML5, entities may take up to 33 bytes */
- if (len + 40 maxlen) {
- replaced = erealloc(replaced, (maxlen += 128) + 1);
+ if (len maxlen - 40) { /* maxlen can never be smaller than
128 */
+ replaced = safe_erealloc(replaced, maxlen , 1, 128 + 1);
+ maxlen += 128;
}
if (status == FAILURE) {
@@ -1402,8 +1407,11 @@ encode_amp:
}
/* checks passed; copy entity to result */
/* entity size is unbounded, we may need more
memory */
- if (maxlen len + ent_len + 2 /* and ; */) {
- replaced = erealloc(replaced, (maxlen
+= ent_len + 128) + 1);
+ /* at this point maxlen - len = 40 */
+ if (maxlen - len ent_len + 2 /* and ; */) {
+ /* ent_len oldlen, which is certainly
= SIZE_MAX/2 */
+ replaced = safe_erealloc(replaced,
maxlen, 1, ent_len + 128 + 1);
+ maxlen += ent_len + 128;
}
replaced[len++] = '';
memcpy(replaced[len], old[cursor], ent_len);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git: ext/standard/tests/streams/bug60455_02.phpt ext/standard/tests/streams/bug60455_03.phpt ext/standard/tests/streams/bug60455_04.phpt ext/standard/tests/streams/bug60
Commit: 9a460497da3cc2b755f4628350756427fc0a1051
Author: Gustavo André dos Santos Lopes(cataphr...@php.net) Mon, 19 Mar
2012 16:28:10 +
Committer: Gustavo André dos Santos Lopes(cataphr...@php.net) Mon, 19 Mar
2012 16:34:31 +
Parents: 53e3467ff233af4a40626f86ea8a61880722beb8
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=9a460497da3cc2b755f4628350756427fc0a1051
Log:
MFH: 45a6f8d for 5.4.
- Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detected
together with the last read).
- Fixed bug #60817 (stream_get_line() reads from stream even when there is
already sufficient data buffered). stream_get_line() now behaves more like
fgets(), as is documented.
Bugs:
https://bugs.php.net/60455
https://bugs.php.net/60817
Changed paths:
M ext/standard/tests/streams/bug60455_02.phpt
M ext/standard/tests/streams/bug60455_03.phpt
A ext/standard/tests/streams/bug60455_04.phpt
A ext/standard/tests/streams/bug60817.phpt
M main/streams/streams.c
9a460497da3cc2b755f4628350756427fc0a1051
diff --git a/ext/standard/tests/streams/bug60455_02.phpt
b/ext/standard/tests/streams/bug60455_02.phpt
index 6e06e9f..0ddf346 100644
--- a/ext/standard/tests/streams/bug60455_02.phpt
+++ b/ext/standard/tests/streams/bug60455_02.phpt
@@ -28,3 +28,4 @@ while (!feof($f)) {
}
--EXPECT--
string(1) a
+bool(false)
diff --git a/ext/standard/tests/streams/bug60455_03.phpt
b/ext/standard/tests/streams/bug60455_03.phpt
index 5d7ba1f..2429d31 100644
--- a/ext/standard/tests/streams/bug60455_03.phpt
+++ b/ext/standard/tests/streams/bug60455_03.phpt
@@ -47,7 +47,9 @@ while (!feof($f)) {
--EXPECT--
string(1) a
string(1) b
+bool(false)
string(1) a
string(0)
+bool(false)
string(1) a
string(0)
diff --git a/ext/standard/tests/streams/bug60455_04.phpt
b/ext/standard/tests/streams/bug60455_04.phpt
new file mode 100644
index 000..3a82298
--- /dev/null
+++ b/ext/standard/tests/streams/bug60455_04.phpt
@@ -0,0 +1,32 @@
+--TEST--
+Bug #60455: stream_get_line and 1-line with maxlen size followed by 0-length
+read with EOL indication
+--FILE--
+?php
+class TestStream {
+ private $s = 0;
+ function stream_open($path, $mode, $options, $opened_path) {
+ return true;
+ }
+ function stream_read($count) {
+ if ($this-s++ == 0)
+ return a\n;
+
+ return ;
+ }
+ function stream_eof() {
+ return $this-s = 2;
+ }
+
+}
+
+stream_wrapper_register(test, TestStream);
+
+$f = fopen(test://, r);
+while (!feof($f)) {
+$line = stream_get_line($f, 2, \n);
+var_dump($line);
+}
+--EXPECT--
+string(1) a
+bool(false)
diff --git a/ext/standard/tests/streams/bug60817.phpt
b/ext/standard/tests/streams/bug60817.phpt
new file mode 100644
index 000..2d4cf26
--- /dev/null
+++ b/ext/standard/tests/streams/bug60817.phpt
@@ -0,0 +1,36 @@
+--TEST--
+Bug #60817: stream_get_line() reads from stream even when there is already
sufficient data buffered
+--FILE--
+?php
+class TestStream { //data, empty data, empty data + eof
+private $s = 0;
+function stream_open($path, $mode, $options, $opened_path) {
+return true;
+}
+function stream_read($count) {
+echo Read done\n;
+if ($this-s++ == 0)
+return a\nbb\ncc;
+
+return ;
+}
+function stream_eof() {
+return $this-s = 2;
+}
+
+}
+
+stream_wrapper_register(test, TestStream);
+
+$f = fopen(test://, r);
+while (!feof($f)) {
+$line = stream_get_line($f, 99, \n);
+var_dump($line);
+}
+
+--EXPECT--
+Read done
+string(1) a
+string(2) bb
+Read done
+string(2) cc
diff --git a/main/streams/streams.c b/main/streams/streams.c
index 1614307..89fa364 100755
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -996,77 +996,111 @@ PHPAPI char *_php_stream_get_line(php_stream *stream,
char *buf, size_t maxlen,
return bufstart;
}
+#define STREAM_BUFFERED_AMOUNT(stream) \
+ ((size_t)(((stream)-writepos) - (stream)-readpos))
+
+static char *_php_stream_search_delim(php_stream *stream,
+
size_t maxlen,
+
size_t skiplen,
+ char
*delim, /* non-empty! */
+
size_t delim_len TSRMLS_DC)
+{
+ size_t seek_len;
+
+ /* set the maximum number of bytes we're allowed to read from buffer */
+ seek_len = MIN(STREAM_BUFFERED_AMOUNT(stream), maxlen);
+ if (seek_len = skiplen) {
+ return NULL;
+ }
+
+ if (delim_len == 1) {
+ return memchr(stream-readbuf[stream-readpos + skiplen],
+ delim[0], seek_len - skiplen);
+ } else {
+ return
[PHP-CVS] [git] commit php-src.git: UPGRADING
Commit: 867d980574ec8086cc40634fbd62af257504b8ea Author: Michael Wallner(m...@php.net) Mon, 19 Mar 2012 20:15:54 +0100 Committer: Michael Wallner(m...@php.net) Mon, 19 Mar 2012 20:15:54 +0100 Parents: f5f5ca5d77cfe47b9556b3cc37fbf9605b822e5c Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=867d980574ec8086cc40634fbd62af257504b8ea Log: add note about corrected tiger hash output Changed paths: M UPGRADING Diff: 867d980574ec8086cc40634fbd62af257504b8ea diff --git a/UPGRADING b/UPGRADING index bbc5478..d92e057 100755 --- a/UPGRADING +++ b/UPGRADING @@ -467,6 +467,10 @@ b. Extensions with changed behavior is set with date.timezone and/or date_default_timezone_set(). Instead it will always fall back to UTC. + - Hash extension + - the output of the tiger hash family has been corrected, see + https://bugs.php.net/61307 + === 10. Changes in SAPI support === -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] [git] commit php-src.git: UPGRADING
Shouldn't the commit mails reference the push mail? Looks a bit messy without relations of commit/push mails. On 19 March 2012 20:33, Michael Wallner m...@php.net wrote: Commit: 867d980574ec8086cc40634fbd62af257504b8ea Author: Michael Wallner(m...@php.net) Mon, 19 Mar 2012 20:15:54 +0100 Committer: Michael Wallner(m...@php.net) Mon, 19 Mar 2012 20:15:54 +0100 Parents: f5f5ca5d77cfe47b9556b3cc37fbf9605b822e5c Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=867d980574ec8086cc40634fbd62af257504b8ea Log: add note about corrected tiger hash output Changed paths: M UPGRADING Diff: 867d980574ec8086cc40634fbd62af257504b8ea diff --git a/UPGRADING b/UPGRADING index bbc5478..d92e057 100755 --- a/UPGRADING +++ b/UPGRADING @@ -467,6 +467,10 @@ b. Extensions with changed behavior is set with date.timezone and/or date_default_timezone_set(). Instead it will always fall back to UTC. + - Hash extension + - the output of the tiger hash family has been corrected, see + https://bugs.php.net/61307 + === 10. Changes in SAPI support === -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Regards, Mike -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: 4b6d10a06ac2f01c4b4229f03b7bb11d7e530437 Author: Ilia Alshanetsky(ili...@php.net) Mon, 19 Mar 2012 13:16:14 -0400 Committer: Ilia Alshanetsky(ili...@php.net) Mon, 19 Mar 2012 13:16:14 -0400 Parents: ae5e8ad9c3e1594bdd56db302347e34456c9478c 5709f7dd5bd6874257f7b0f49f90fc1ff627a918 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4b6d10a06ac2f01c4b4229f03b7bb11d7e530437 Log: Merge branch '54' * 54: add note about corrected tiger hash output Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c). MFH: 7dcada1 for 5.4 MFH: 45a6f8d for 5.4. Bugs: https://bugs.php.net/61430 Changed paths: Diff: 4b6d10a06ac2f01c4b4229f03b7bb11d7e530437 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git: NEWS
Commit: 5709f7dd5bd6874257f7b0f49f90fc1ff627a918 Author: Ilia Alshanetsky(ili...@php.net) Mon, 19 Mar 2012 13:10:53 -0400 Committer: Ilia Alshanetsky(ili...@php.net) Mon, 19 Mar 2012 13:10:53 -0400 Parents: 867d980574ec8086cc40634fbd62af257504b8ea edb57810a707e92b3fdb03fcf36fee53e1f69fd3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5709f7dd5bd6874257f7b0f49f90fc1ff627a918 Log: Merge branch '53' into 54 * 53: Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c). Bugs: https://bugs.php.net/61430 Changed paths: MM NEWS 5709f7dd5bd6874257f7b0f49f90fc1ff627a918 diff --combined NEWS index 1b9b4cf,a2d7c05..ae0d190 --- a/NEWS +++ b/NEWS @@@ -1,43 -1,38 +1,47 @@@ PHP NEWS ||| -?? ??? 2012, PHP 5.3.11 +?? ??? 2012, PHP 5.4.1 RC1 + +- CLI Server: + . Implemented FR #60850 (Built in web server does not set +$_SERVER['SCRIPT_FILENAME'] when using router). (Laruence) + . Connection: close instead of Connection: closed (Gustavo) - Core: - . Fixed bug #61273 (call_user_func_array with more than 16333 arguments + . Fixed bug #61374 (html_entity_decode tries to decode code points that don't +exist in ISO-8859-1). (Gustavo) + . Fixed bug #61273 (call_user_func_array with more than 16333 arguments leaks / crashes). (Laruence) + . Fixed bug #61225 (Incorrect lexing of 0b00*+NUM). (Pierrick) . Fixed bug #61165 (Segfault - strip_tags()). (Laruence) - . Improved max_input_vars directive to check nested variables (Dmitry). - . Fixed bug #61095 (Incorect lexing of 0x00*+NUM). (Etienne) + . Fixed bug #61106 (Segfault when using header_register_callback). (Nikita +Popov) . Fixed bug #61087 (Memory leak in parse_ini_file when specifying invalid scanner mode). (Nikic, Laruence) . Fixed bug #61072 (Memory leak when restoring an exception handler). (Nikic, Laruence) . Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX). - (Laruence) - . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical - vars). (Laruence) - . Fix bug #60895 (Possible invalid handler usage in windows random -functions). (Pierre) - . Fixed bug #60825 (Segfault when running symfony 2 tests). -(Dmitry, Laruence) +(Laruence) + . Fixed bug #61052 (Missing error check in trait 'insteadof' clause). (Stefan) + . Fixed bug #61011 (Crash when an exception is thrown by __autoload +accessing a static property). (Laruence) + . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical +vars). (Laruence) + . Fixed bug #60978 (exit code incorrect). (Laruence) + . Fixed bug #60911 (Confusing error message when extending traits). (Stefan) . Fixed bug #60801 (strpbrk() mishandles NUL byte). (Adam) + . Fixed bug #60717 (Order of traits in use statement can cause a fatal +error). (Stefan) + . Fixed bug #60573 (type hinting with self keyword causes weird errors). +(Laruence) . Fixed bug #60569 (Nullbyte truncates Exception $message). (Ilia) - . Fixed bug #60227 (header() cannot detect the multi-line header with CR). -(rui, Gustavo) - . Fixed bug #60222 (time_nanosleep() does validate input params). (Ilia) . Fixed bug #52719 (array_walk_recursive crashes if third param of the function is by reference). (Nikita Popov) - . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry) + - FPM + . Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c). + (michaelhood at gmail dot com, Ilia) + - Ibase . Fixed bug #60947 (Segmentation fault while executing ibase_db_info). (Ilia) @@@ -45,504 -40,97 +49,504 @@@ - Installation . Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones) -- Fileinfo - . Fixed bug #61173 (Unable to detect error from finfo constructor). (Gustavo) - -- Firebird Database extension (ibase): - . Fixed bug #60802 (ibase_trans() gives segfault when passing params). +- mbstring: + . MFH mb_ereg_replace_callback() for security enhancements. (Rui) - mysqli . Fixed bug #61003 (mysql_stat() require a valid connection). (Johannes). +- mysqlnd + . Fixed bug #60948 (mysqlnd FTBFS when -Wformat-security is enabled). +(Johannes) + +- Readline: + . Fixed bug #61088 (Memory leak in readline_callback_handler_install). +(Nikic, Laruence) + +- Session + . Fixed bug #60634 (Segmentation fault when trying to die() in +SessionHandler::write()). (Ilia) + +- SOAP + . Fixed bug #60887 (SoapClient ignores user_agent option and sends no +User-Agent header). (carloschilazo at gmail dot com) + . Fixed bug #60842, #51775 (Chunked response parsing error when +chunksize length line is 10 bytes). (Ilia) + +- PDO + . Fixed bug #61292 (Segfault while calling a
[PHP-CVS] [git] commit php-src.git: NEWS sapi/fpm/fpm/fpm_shm.c
Commit: edb57810a707e92b3fdb03fcf36fee53e1f69fd3
Author: Ilia Alshanetsky(ili...@php.net) Mon, 19 Mar 2012 13:10:23 -0400
Committer: Ilia Alshanetsky(ili...@php.net) Mon, 19 Mar 2012 13:10:23 -0400
Parents: bcd19cf6491030f3bfd14d769011ba8f20d99333
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=edb57810a707e92b3fdb03fcf36fee53e1f69fd3
Log:
Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
Bugs:
https://bugs.php.net/61430
Changed paths:
M NEWS
M sapi/fpm/fpm/fpm_shm.c
Diff:
edb57810a707e92b3fdb03fcf36fee53e1f69fd3
diff --git a/NEWS b/NEWS
index 7563155..a2d7c05 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,10 @@ PHP
NEWS
function is by reference). (Nikita Popov)
. Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry)
+- FPM
+ . Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
+(michaelhood at gmail dot com, Ilia)
+
- Ibase
. Fixed bug #60947 (Segmentation fault while executing ibase_db_info).
(Ilia)
diff --git a/sapi/fpm/fpm/fpm_shm.c b/sapi/fpm/fpm/fpm_shm.c
index 6acbddf..9226adf 100644
--- a/sapi/fpm/fpm/fpm_shm.c
+++ b/sapi/fpm/fpm/fpm_shm.c
@@ -35,7 +35,7 @@ void *fpm_shm_alloc(size_t size) /* {{{ */
return NULL;
}
- memset(mem, size, 0);
+ memset(mem, 0, size);
fpm_shm_size += size;
return mem;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: 3930e1e992247c0e0cb61f3207344889ea069da4 Author: Michael Wallner(m...@php.net) Mon, 19 Mar 2012 21:52:55 +0100 Committer: Michael Wallner(m...@php.net) Mon, 19 Mar 2012 21:52:55 +0100 Parents: 4b6d10a06ac2f01c4b4229f03b7bb11d7e530437 260e77709ddfe9e72e2b7f11393673b6ee18a7f9 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3930e1e992247c0e0cb61f3207344889ea069da4 Log: Merge branch 'PHP-5.4' * PHP-5.4: fix tests failing due to corrected hash tiger Changed paths: Diff: 3930e1e992247c0e0cb61f3207344889ea069da4 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git: ext/hash/tests/mhash_001.phpt ext/hash/tests/mhash_003.phpt
Commit: 260e77709ddfe9e72e2b7f11393673b6ee18a7f9
Author: Michael Wallner(m...@php.net) Mon, 19 Mar 2012 21:49:47 +0100
Committer: Michael Wallner(m...@php.net) Mon, 19 Mar 2012 21:49:47 +0100
Parents: 867d980574ec8086cc40634fbd62af257504b8ea
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=260e77709ddfe9e72e2b7f11393673b6ee18a7f9
Log:
fix tests failing due to corrected hash tiger
mhash_00{1,3}.phpt were failing because of the corrected hash tiger byte
output order
fixes bug #60922:
tests fail for mhash() and mhash_keygen_s2k() functions and MHASH_TIGER
Bugs:
https://bugs.php.net/60922
Changed paths:
M ext/hash/tests/mhash_001.phpt
M ext/hash/tests/mhash_003.phpt
Diff:
260e77709ddfe9e72e2b7f11393673b6ee18a7f9
diff --git a/ext/hash/tests/mhash_001.phpt b/ext/hash/tests/mhash_001.phpt
index 5df0378..e8aac9b 100644
--- a/ext/hash/tests/mhash_001.phpt
+++ b/ext/hash/tests/mhash_001.phpt
@@ -16,7 +16,7 @@ $supported_hash_al = array(
MHASH_HAVAL160 = c6b36f87750b18576981bc17b4f22271947bf9cb,
MHASH_RIPEMD160 = 6c47435aa1d359c4b7c6af46349f0c3e1258583d,
MHASH_GOST =
101b0a2552cebdf5137cadf15147f21e55b6432935bb9c2c03c7e28d188b2d9e,
-MHASH_TIGER = fdb9019a79c33a95677e2097abae91eb0de00b3054bb5c39,
+MHASH_TIGER = 953ac3799a01b9fdeb91aeab97207e67395cbb54300be00d,
MHASH_CRC32 = 83041db8,
MHASH_CRC32B= df5ab7a4
);
diff --git a/ext/hash/tests/mhash_003.phpt b/ext/hash/tests/mhash_003.phpt
index 7dcf247..38d1a8b 100644
--- a/ext/hash/tests/mhash_003.phpt
+++ b/ext/hash/tests/mhash_003.phpt
@@ -16,7 +16,7 @@ $supported_hash_al = array(
MHASH_HAVAL160 =
d6e5f0ef07f3facced646eedb6364758ecde6dc6fb061e00a496f5ceb723f78ea135884d9682226ded69c11d8431240ef97cad583c4f29593bbf3dd3cab0b8792eb3d86022ca6002ebd0d9b4429909d4af85bed2b5a96b3e47b9b8cac919c1177ec40d7e,
MHASH_RIPEMD160 =
e4d5db469af29f78e2b90dc735c9cf020a1d5b19a6674458677794d4dca144d426c562aff98d8e866a8a924299ebf6b0ea9a1637f987a1fb5de9b647edc35b1447605e1babc3084be7a003931117eb33432d4142e225df044b033f3ff64bb4a18682a4f9,
MHASH_GOST =
c044f669bd7e8643953d77c682fd179242d9df157dadf873be4d9601e4647c018234689359e7220ab0492a6240d184c478634073dea87f79be7f86fd4e2564f7d709b68a46440a121250e00fc7d57d45a9c07ee23a704ff4148c0dad7077ec527b194d87,
-MHASH_TIGER =
67eac97b9dca0a47b1f6262f330264e4ce1c233760fe3255f642512fd3127929baccf1e758236b2768a4c2c0c06e118b19e40e2f04a5f745820fb8a99bdbc00698702a4d3120171856c4c94bda79ba1b4f60d509d7f8954da818a29797368dd47c1122aa,
+MHASH_TIGER =
470aca9d7bc9ea67e46402332f26f6b15532fe6037231cce297912d32f5142f6276b2358e7f1ccba8b116ec0c0c2a46845f7a5042f0ee41906c0db9ba9b80f82181720314d2a70981bba79da4bc9c4564d95f8d709d5604fd48d369797a218a862196f48,
MHASH_CRC32 =
481c40148c26185f9a59ef18e86f51c5d2d0315b46711d22ae08c1ccdd669fe956c817380815e3a545f6ee453c9da48d1d994dbc3ac8ba85a572108412f06b2a16b1489cda75b118e82f7d9bdfdb68336957bbf19e4a3f76750d6985a53dd557229dfcf3,
MHASH_CRC32B =
65ab6cb5fb7d3ea67f5da92a9bd746b6628a13368fcbcd43af49092e9c6a960fd030a5ce3c1f0ddb512ec698be96e77969748db66278b0fd837d24d8c898f50bd70993b48cc8accf4b44c54431e91385ddf04c7560a1a7368fc9e6f763457c90b07f04f1
);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: 69a016b50431a1dca2c42efceac5ce92803d7f67 Author: Ilia Alshanetsky(ili...@php.net) Mon, 19 Mar 2012 13:49:23 -0400 Committer: Ilia Alshanetsky(ili...@php.net) Mon, 19 Mar 2012 13:49:23 -0400 Parents: 5709f7dd5bd6874257f7b0f49f90fc1ff627a918 260e77709ddfe9e72e2b7f11393673b6ee18a7f9 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=69a016b50431a1dca2c42efceac5ce92803d7f67 Log: Merge branch 'PHP-5.4' of http://git.php.net/repository/php-src into 54 * 'PHP-5.4' of http://git.php.net/repository/php-src: fix tests failing due to corrected hash tiger Changed paths: Diff: 69a016b50431a1dca2c42efceac5ce92803d7f67 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] [git] commit php-src.git: ext/hash/tests/mhash_001.phpt ext/hash/tests/mhash_003.phpt
Should the commit to bugs.php.net hook already work?
A link was obviously added to the commit message, but the bug was not commented.
Just in case...
On 19 March 2012 22:04, Michael Wallner m...@php.net wrote:
Commit: 260e77709ddfe9e72e2b7f11393673b6ee18a7f9
Author: Michael Wallner(m...@php.net) Mon, 19 Mar 2012 21:49:47 +0100
Committer: Michael Wallner(m...@php.net) Mon, 19 Mar 2012 21:49:47 +0100
Parents: 867d980574ec8086cc40634fbd62af257504b8ea
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=260e77709ddfe9e72e2b7f11393673b6ee18a7f9
Log:
fix tests failing due to corrected hash tiger
mhash_00{1,3}.phpt were failing because of the corrected hash tiger byte
output order
fixes bug #60922:
tests fail for mhash() and mhash_keygen_s2k() functions and MHASH_TIGER
Bugs:
https://bugs.php.net/60922
Changed paths:
M ext/hash/tests/mhash_001.phpt
M ext/hash/tests/mhash_003.phpt
Diff:
260e77709ddfe9e72e2b7f11393673b6ee18a7f9
diff --git a/ext/hash/tests/mhash_001.phpt b/ext/hash/tests/mhash_001.phpt
index 5df0378..e8aac9b 100644
--- a/ext/hash/tests/mhash_001.phpt
+++ b/ext/hash/tests/mhash_001.phpt
@@ -16,7 +16,7 @@ $supported_hash_al = array(
MHASH_HAVAL160 = c6b36f87750b18576981bc17b4f22271947bf9cb,
MHASH_RIPEMD160 = 6c47435aa1d359c4b7c6af46349f0c3e1258583d,
MHASH_GOST =
101b0a2552cebdf5137cadf15147f21e55b6432935bb9c2c03c7e28d188b2d9e,
-MHASH_TIGER = fdb9019a79c33a95677e2097abae91eb0de00b3054bb5c39,
+MHASH_TIGER = 953ac3799a01b9fdeb91aeab97207e67395cbb54300be00d,
MHASH_CRC32 = 83041db8,
MHASH_CRC32B = df5ab7a4
);
diff --git a/ext/hash/tests/mhash_003.phpt b/ext/hash/tests/mhash_003.phpt
index 7dcf247..38d1a8b 100644
--- a/ext/hash/tests/mhash_003.phpt
+++ b/ext/hash/tests/mhash_003.phpt
@@ -16,7 +16,7 @@ $supported_hash_al = array(
MHASH_HAVAL160 =
d6e5f0ef07f3facced646eedb6364758ecde6dc6fb061e00a496f5ceb723f78ea135884d9682226ded69c11d8431240ef97cad583c4f29593bbf3dd3cab0b8792eb3d86022ca6002ebd0d9b4429909d4af85bed2b5a96b3e47b9b8cac919c1177ec40d7e,
MHASH_RIPEMD160 =
e4d5db469af29f78e2b90dc735c9cf020a1d5b19a6674458677794d4dca144d426c562aff98d8e866a8a924299ebf6b0ea9a1637f987a1fb5de9b647edc35b1447605e1babc3084be7a003931117eb33432d4142e225df044b033f3ff64bb4a18682a4f9,
MHASH_GOST =
c044f669bd7e8643953d77c682fd179242d9df157dadf873be4d9601e4647c018234689359e7220ab0492a6240d184c478634073dea87f79be7f86fd4e2564f7d709b68a46440a121250e00fc7d57d45a9c07ee23a704ff4148c0dad7077ec527b194d87,
-MHASH_TIGER =
67eac97b9dca0a47b1f6262f330264e4ce1c233760fe3255f642512fd3127929baccf1e758236b2768a4c2c0c06e118b19e40e2f04a5f745820fb8a99bdbc00698702a4d3120171856c4c94bda79ba1b4f60d509d7f8954da818a29797368dd47c1122aa,
+MHASH_TIGER =
470aca9d7bc9ea67e46402332f26f6b15532fe6037231cce297912d32f5142f6276b2358e7f1ccba8b116ec0c0c2a46845f7a5042f0ee41906c0db9ba9b80f82181720314d2a70981bba79da4bc9c4564d95f8d709d5604fd48d369797a218a862196f48,
MHASH_CRC32 =
481c40148c26185f9a59ef18e86f51c5d2d0315b46711d22ae08c1ccdd669fe956c817380815e3a545f6ee453c9da48d1d994dbc3ac8ba85a572108412f06b2a16b1489cda75b118e82f7d9bdfdb68336957bbf19e4a3f76750d6985a53dd557229dfcf3,
MHASH_CRC32B =
65ab6cb5fb7d3ea67f5da92a9bd746b6628a13368fcbcd43af49092e9c6a960fd030a5ce3c1f0ddb512ec698be96e77969748db66278b0fd837d24d8c898f50bd70993b48cc8accf4b44c54431e91385ddf04c7560a1a7368fc9e6f763457c90b07f04f1
);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Regards,
Mike
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: 74eb9d47300274d81e7907c58eab92242baf7919 Author: David Soria Parra(d...@php.net) Mon, 19 Mar 2012 22:11:02 +0100 Committer: David Soria Parra(d...@php.net) Mon, 19 Mar 2012 22:11:02 +0100 Parents: 69a016b50431a1dca2c42efceac5ce92803d7f67 91f2d3809eb9575874ab60f04b7412785fb5b03c Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=74eb9d47300274d81e7907c58eab92242baf7919 Log: Merge branch 'pull-request/5' into PHP-5.4 * pull-request/5: Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK Changed paths: Diff: 74eb9d47300274d81e7907c58eab92242baf7919 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git: ext/spl/spl_directory.c ext/spl/tests/filesystemiterator_flags.phpt
Commit: 91f2d3809eb9575874ab60f04b7412785fb5b03c
Author: Joshua Thijssen(jthijs...@noxlogic.nl) Mon, 19 Mar 2012
21:48:55 +0100
Committer: Joshua Thijssen(jthijs...@noxlogic.nl) Mon, 19 Mar 2012
21:48:55 +0100
Parents: 53e3467ff233af4a40626f86ea8a61880722beb8
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=91f2d3809eb9575874ab60f04b7412785fb5b03c
Log:
Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK
Changed paths:
M ext/spl/spl_directory.c
A ext/spl/tests/filesystemiterator_flags.phpt
Diff:
91f2d3809eb9575874ab60f04b7412785fb5b03c
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index eeb9ecc..c6eec94 100755
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -3020,6 +3020,7 @@ PHP_MINIT_FUNCTION(spl_directory)
REGISTER_SPL_CLASS_CONST_LONG(FilesystemIterator, FOLLOW_SYMLINKS,
SPL_FILE_DIR_FOLLOW_SYMLINKS);
REGISTER_SPL_CLASS_CONST_LONG(FilesystemIterator, KEY_AS_FILENAME,
SPL_FILE_DIR_KEY_AS_FILENAME);
REGISTER_SPL_CLASS_CONST_LONG(FilesystemIterator,
NEW_CURRENT_AND_KEY,
SPL_FILE_DIR_KEY_AS_FILENAME|SPL_FILE_DIR_CURRENT_AS_FILEINFO);
+ REGISTER_SPL_CLASS_CONST_LONG(FilesystemIterator, OTHER_MODE_MASK,
SPL_FILE_DIR_OTHERS_MASK);
REGISTER_SPL_CLASS_CONST_LONG(FilesystemIterator, SKIP_DOTS,
SPL_FILE_DIR_SKIPDOTS);
REGISTER_SPL_CLASS_CONST_LONG(FilesystemIterator, UNIX_PATHS,
SPL_FILE_DIR_UNIXPATHS);
diff --git a/ext/spl/tests/filesystemiterator_flags.phpt
b/ext/spl/tests/filesystemiterator_flags.phpt
new file mode 100644
index 000..6353456
--- /dev/null
+++ b/ext/spl/tests/filesystemiterator_flags.phpt
@@ -0,0 +1,40 @@
+--TEST--
+SPL: FilesystemIterator::getFlags() basic tests
+--CREDITS--
+Joshua Thijssen jthijs...@noxlogic.nl
+--FILE--
+?php
+
+$it = new FileSystemIterator(.);
+printflags($it);
+
+$it-setFlags(FileSystemIterator::CURRENT_AS_SELF |
+ FileSystemIterator::KEY_AS_FILENAME |
+ FileSystemIterator::SKIP_DOTS |
+ FileSystemIterator::UNIX_PATHS);
+printflags($it);
+
+$it-setFlags(-1);
+printflags($it);
+
+function printflags($it) {
+ printf(%08X\n, $it-getFlags());
+ printf(%08X\n, ($it-getFlags()
FileSystemIterator::CURRENT_MODE_MASK));
+ printf(%08X\n, ($it-getFlags() FileSystemIterator::KEY_MODE_MASK));
+ printf(%08X\n, ($it-getFlags()
FileSystemIterator::OTHER_MODE_MASK));
+}
+
+?
+--EXPECT--
+1000
+
+
+1000
+3110
+0010
+0100
+3000
+3FF0
+00F0
+0F00
+3000
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: 4335053636d135a7cc5df16c7f81c369c8f41ac1 Author: David Soria Parra(d...@php.net) Mon, 19 Mar 2012 22:11:21 +0100 Committer: David Soria Parra(d...@php.net) Mon, 19 Mar 2012 22:11:21 +0100 Parents: 3930e1e992247c0e0cb61f3207344889ea069da4 74eb9d47300274d81e7907c58eab92242baf7919 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4335053636d135a7cc5df16c7f81c369c8f41ac1 Log: Merge branch 'PHP-5.4' * PHP-5.4: Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK Changed paths: Diff: 4335053636d135a7cc5df16c7f81c369c8f41ac1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: 08f586984f7f067c005d7a252e76f8ddeabb6aec Author: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:18:06 -0700 Committer: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:18:06 -0700 Parents: 74eb9d47300274d81e7907c58eab92242baf7919 4a6d9b348febe7895a2748977898c09b6e40a7ce Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=08f586984f7f067c005d7a252e76f8ddeabb6aec Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Minor text changes (to try new git repo) Changed paths: Diff: 08f586984f7f067c005d7a252e76f8ddeabb6aec -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git: ext/oci8/README
Commit: 4a6d9b348febe7895a2748977898c09b6e40a7ce Author: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:16:33 -0700 Committer: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:16:33 -0700 Parents: edb57810a707e92b3fdb03fcf36fee53e1f69fd3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4a6d9b348febe7895a2748977898c09b6e40a7ce Log: Minor text changes (to try new git repo) Changed paths: M ext/oci8/README Diff: 4a6d9b348febe7895a2748977898c09b6e40a7ce diff --git a/ext/oci8/README b/ext/oci8/README index 037d549..db7db57 100644 --- a/ext/oci8/README +++ b/ext/oci8/README @@ -1,10 +1,10 @@ The OCI8 Extension -- -The OCI8 extension allows PHP to access Oracle databases. It can be -built using Oracle 9.2, 10, or 11 client libraries. It allows Oracle's -standard cross-version connectivity, for example PHP using Oracle 10.2 -libraries can connect to Oracle Database 9.2 onwards. +The OCI8 extension allows PHP to access Oracle Database. It can be +built using Oracle 9.2, 10, or 11 client libraries. It allows +Oracle's standard cross-version connectivity. For example PHP linked +with Oracle 10.2 libraries can connect to Oracle Database 9.2 onwards. This release of OCI8 can be used with PHP versions 4.3.9 to 5.x. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: eda790de0fbd5e7454c2efd5dc33a575bec9631f Author: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:25:27 -0700 Committer: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:25:27 -0700 Parents: faa731f1477d64c946d718e5b7d53406e111b790 4335053636d135a7cc5df16c7f81c369c8f41ac1 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eda790de0fbd5e7454c2efd5dc33a575bec9631f Log: Merge branch 'master' of https://git.php.net/repository/php-src * 'master' of https://git.php.net/repository/php-src: Changed paths: Diff: eda790de0fbd5e7454c2efd5dc33a575bec9631f -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: faa731f1477d64c946d718e5b7d53406e111b790 Author: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:19:00 -0700 Committer: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:19:00 -0700 Parents: 3930e1e992247c0e0cb61f3207344889ea069da4 08f586984f7f067c005d7a252e76f8ddeabb6aec Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=faa731f1477d64c946d718e5b7d53406e111b790 Log: Merge branch 'PHP-5.4' * PHP-5.4: Minor text changes (to try new git repo) Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK Changed paths: Diff: faa731f1477d64c946d718e5b7d53406e111b790 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git: makedist
Commit: 44d948996fd51249a4451189ec8e8239b9b20034
Author: Stanislav Malyshev(smalys...@gmail.com) Mon, 19 Mar 2012
22:28:16 -0700
Committer: Stanislav Malyshev(smalys...@gmail.com) Mon, 19 Mar 2012
22:28:16 -0700
Parents: 08f586984f7f067c005d7a252e76f8ddeabb6aec
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=44d948996fd51249a4451189ec8e8239b9b20034
Log:
adapt makedist to git
Changed paths:
M makedist
Diff:
44d948996fd51249a4451189ec8e8239b9b20034
diff --git a/makedist b/makedist
index d5449f7..992e8a1 100755
--- a/makedist
+++ b/makedist
@@ -1,35 +1,29 @@
#!/bin/sh
#
-# Distribution generator for SVN based packages.
-# To work, this script needs a consistent tagging of all releases.
-# Each release of a package should have a tag of the form
+# Distribution generator for git
#
-# package_version
+# Usage: makedist version
+# Example: makedist 5.4.1
+# Example: makedist 5.3.5-RC1
#
-# where package is the package name and the SVN module
-# and version s the version number with underscores instead of dots.
+# To work, this script needs a consistent tagging of all releases.
+# Each release of a package should have a tag of the form
#
-# For example: svn cp $PHPROOT/php/php-src/trunk
$PHPROOT/php/php-src/tags/php_5_0_1
+# PHP-X.Y.Z[-sub]
#
# The distribution ends up in a .tar.gz file that contains the distribution
-# in a directory called package-version. The distribution contains all
-# directories from the SVN module except the one called nodist, but only
-# the files INSTALL, README and config* are included.
+# in a directory called php-version.
# A .tar.bz2 file is also created.
-#
-# Usage: makedist package version
-#
+#
# Written by Stig Bakken s...@guardian.no 1997-05-28.
-#
-# $Id$
-#
+# Adapted to git by Stanislav Malyshev s...@php.net
-if test $# != 2; then
-echo Usage: makedist package version 2
+
+if test $# != 1; then
+echo Usage: makedist version 2
exit 1
fi
-PKG=$1 ; shift
VER=$1 ; shift
old_IFS=$IFS
@@ -37,12 +31,11 @@ IFS=.
eval set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./
/'`
if test ${1} = 1 -a ${2} -lt 28; then
echo You will need bison 1.28 if you want to regenerate the Zend parser
(found ${1}.${2}).)
- exit 10
+ exit 2
fi
IFS=$old_IFS
-PHPROOT=http://svn.php.net/repository
-PHPMOD=php/php-src
+PHPROOT=g...@git.php.net:php-src.git
LT_TARGETS='ltconfig ltmain.sh config.guess config.sub'
if echo '\c' | grep -s c /dev/null 21
@@ -57,10 +50,10 @@ fi
MY_OLDPWD=`pwd`
# the destination .tar.gz file
-ARCHIVE=$MY_OLDPWD/$PKG-$VER.tar
+ARCHIVE=$MY_OLDPWD/php-$VER.tar
# temporary directory used to check out files from SVN
-DIR=$PKG-$VER
+DIR=php-$VER
DIRPATH=$MY_OLDPWD/$DIR
if test -d $DIRPATH; then
@@ -69,28 +62,12 @@ if test -d $DIRPATH; then
exit 1
fi
-# version part of the SVN release tag
-SVNVER=`echo $VER | sed -e 's/[\.\-]/_/g'`
-
-# SVN release tag
-if test $VER != HEAD -a $VER != trunk; then
- SVNTAG=tags/${PKG}_$SVNVER
-else
- SVNTAG=trunk
-fi
-
-#if test ! -d $DIRPATH; then
-#mkdir -p $DIRPATH || exit 2
-#fi
-
# Export PHP
-$ECHO_N makedist: exporting tag '$SVNTAG' from '$PHPMOD'...$ECHO_C
-svn export $PHPROOT/$PHPMOD/$SVNTAG $DIRPATH || exit 4
+$ECHO_N makedist: exporting tag 'PHP-$VER' from '$PHPROOT'...$ECHO_C
+git archive --format=tar --remote=$PHPROOT refs/tags/PHP-$VER
--prefix=php-$VER/ | (cd $MY_OLDPWD; tar xvf -) || exit 4
echo
-# remove SVN stuff...
cd $DIR || exit 5
-find . \( -name .svn -type d \) -exec rm -rf {} \;
# The full ChangeLog is available separately from lxr.php.net
rm -f ChangeLog*
@@ -119,25 +96,29 @@ for i in $LT_TARGETS; do
test -f $i mv $i.bak $i
done
+# removing junk files
+find . -name \*.orig -print0 | xargs -0 rm
+rm -fr autom4te.cache/
+
# download pear
$ECHO_N makedist: Attempting to download PEAR's phar archive
if test ! -x wget; then
wget http://pear.php.net/install-pear-nozlib.phar -nd -P pear/
else
$ECHO_N Missing wget binary needed for pear download;
- exit 0;
+ exit 7
fi
cd $MY_OLDPWD
$ECHO_N makedist: making gzipped tar archive...$ECHO_C
rm -f $ARCHIVE.gz
-tar cf $ARCHIVE $PKG-$VER || exit 8
+tar cf $ARCHIVE php-$VER || exit 8
gzip -9 $ARCHIVE || exit 9
echo
$ECHO_N makedist: making bz2zipped tar archive...$ECHO_C
rm -f $ARCHIVE.bz2
-tar cf $ARCHIVE $PKG-$VER || exit 10
+tar cf $ARCHIVE php-$VER || exit 10
bzip2 -9 $ARCHIVE || exit 11
echo
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
