]>
granicus.if.org Git - php/log
Lior Kaplan [Fri, 14 Feb 2014 15:19:33 +0000 (17:19 +0200)]
Merge branch 'PHP-5.6'
Veres Lajos [Fri, 14 Feb 2014 15:16:17 +0000 (17:16 +0200)]
a few typofixes
Lior Kaplan [Fri, 14 Feb 2014 15:15:35 +0000 (17:15 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Veres Lajos [Fri, 14 Feb 2014 15:12:52 +0000 (17:12 +0200)]
a few typofixes
Lior Kaplan [Fri, 14 Feb 2014 13:30:00 +0000 (15:30 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Veres Lajos [Fri, 14 Feb 2014 12:51:10 +0000 (14:51 +0200)]
a few typofixes
Yasuo Ohgaki [Thu, 13 Feb 2014 23:56:21 +0000 (08:56 +0900)]
Update NEWS and UPGRADING
Ferenc Kovacs [Thu, 13 Feb 2014 23:22:31 +0000 (00:22 +0100)]
move the peer verification NEWS entry to the alpha2 block, as it was pushed after alpha1
Ferenc Kovacs [Thu, 13 Feb 2014 22:21:28 +0000 (23:21 +0100)]
mention ldap_modify_batch()
Yasuo Ohgaki [Thu, 13 Feb 2014 02:56:54 +0000 (11:56 +0900)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Implement RFC https://wiki.php.net/rfc/default_encoding
Yasuo Ohgaki [Thu, 13 Feb 2014 02:54:52 +0000 (11:54 +0900)]
Implement RFC https://wiki.php.net/rfc/default_encoding
Ferenc Kovacs [Wed, 12 Feb 2014 05:40:43 +0000 (06:40 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update the alpha2 release date
Make html_table_gen consistent with html_table.h
Ferenc Kovacs [Wed, 12 Feb 2014 05:39:10 +0000 (06:39 +0100)]
update the alpha2 release date
Derick Rethans [Tue, 11 Feb 2014 11:31:57 +0000 (11:31 +0000)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Derick Rethans [Tue, 11 Feb 2014 11:31:13 +0000 (11:31 +0000)]
Merge branch 'PHP-5.6'
Derick Rethans [Tue, 11 Feb 2014 11:31:06 +0000 (11:31 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Tue, 11 Feb 2014 11:27:01 +0000 (11:27 +0000)]
Fixed ZTS and added fix to NEWS.
Derick Rethans [Sun, 9 Feb 2014 20:57:43 +0000 (15:57 -0500)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Thu, 6 Feb 2014 02:00:13 +0000 (21:00 -0500)]
Implemented feature #45528: Allow the DateTimeZone constructor to accept timezones per offset too.
Derick Rethans [Thu, 6 Feb 2014 01:59:10 +0000 (20:59 -0500)]
Rename timelib_get_zone to timelib_parse_zone and export.
Mats Lindh [Sun, 9 Feb 2014 19:17:26 +0000 (21:17 +0200)]
Replace old SVN references to Git
Nuno Lopes [Sat, 8 Feb 2014 11:54:27 +0000 (06:54 -0500)]
fix regex to detect valgrind version
New PCRE version got stricter
Nuno Lopes [Sat, 8 Feb 2014 11:54:27 +0000 (06:54 -0500)]
fix regex to detect valgrind version
New PCRE version got stricter
Bob Weinand [Thu, 6 Feb 2014 20:31:40 +0000 (21:31 +0100)]
Fixed memory leak in pow operator
Julien Pauli [Thu, 6 Feb 2014 14:16:16 +0000 (15:16 +0100)]
5.5.9 now released
Bob Weinand [Thu, 6 Feb 2014 13:45:22 +0000 (14:45 +0100)]
Added information in NEWS and UPGRADING
datibbaw [Tue, 19 Nov 2013 07:36:06 +0000 (15:36 +0800)]
add T_POW (**) operator
Fixed recognition of the operator
Added opcode, still doing multiply instead of pow()
opcode now always returns int(42)
The right answer, but always a float
Yanked code from pow() implementation.
Should not handle negative long as exponent ourselves
Added test cases from pow()
Moved precedence higher than '~'
Added GMP operator overloading
Added ZEND_ASSIGN_POW (**=) operator.
Added pow() as a language construct.
Adjusted test cases for changed precedence.
Reduced pow() to shell function around ZEND_API pow_function()
Reduced test case to only contain edge cases
Added overloading test case
Moved unary minus above T_POW
Revert "Added pow() as a language construct."
Bad bad bad idea.
This reverts commit
f60b98cf7a8371233d800a6faa286ddba4432d02 .
Reverted unary minus behaviour due to previous revert.
Convert arrays to int(0)
Exponent with array as a base becomes int(0)
Rebase against master
Fixed tokenizer test case
Ferenc Kovacs [Thu, 6 Feb 2014 12:48:57 +0000 (13:48 +0100)]
add NEWS block for 5.6.0alpha3
Anatol Belski [Thu, 6 Feb 2014 08:17:54 +0000 (09:17 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated libs_version.txt
update libs_version.txt
Anatol Belski [Thu, 6 Feb 2014 08:17:29 +0000 (09:17 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update libs_version.txt
Conflicts:
win32/build/libs_version.txt
Anatol Belski [Thu, 6 Feb 2014 08:15:28 +0000 (09:15 +0100)]
updated libs_version.txt
Anatol Belski [Thu, 6 Feb 2014 08:14:30 +0000 (09:14 +0100)]
updated libs_version.txt
Anatol Belski [Thu, 6 Feb 2014 08:13:05 +0000 (09:13 +0100)]
update libs_version.txt
Anatol Belski [Wed, 5 Feb 2014 19:13:48 +0000 (20:13 +0100)]
more tests for ICU >= 52.1 compat
Anatol Belski [Wed, 5 Feb 2014 18:16:14 +0000 (19:16 +0100)]
fix tests for ICU >= 52.1
Hannes Magnusson [Wed, 5 Feb 2014 18:17:49 +0000 (10:17 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix year
Hannes Magnusson [Wed, 5 Feb 2014 18:15:50 +0000 (10:15 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix year
Hannes Magnusson [Wed, 5 Feb 2014 18:15:11 +0000 (10:15 -0800)]
Fix year
Anatol Belski [Wed, 5 Feb 2014 14:17:30 +0000 (15:17 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
adapt test to curl 7.35.0 upgrade
Anatol Belski [Wed, 5 Feb 2014 14:16:57 +0000 (15:16 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
adapt test to curl 7.35.0 upgrade
Anatol Belski [Wed, 5 Feb 2014 14:15:34 +0000 (15:15 +0100)]
adapt test to curl 7.35.0 upgrade
which is a security one and should be performed as in
http://curl.haxx.se/docs/adv_20140129.html
Anatol Belski [Wed, 5 Feb 2014 09:52:00 +0000 (10:52 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
move the NEWS entry into the right section
Anatol Belski [Wed, 5 Feb 2014 09:51:08 +0000 (10:51 +0100)]
move the NEWS entry into the right section
Daniel Lowrey [Wed, 5 Feb 2014 02:11:56 +0000 (19:11 -0700)]
Fixed SNI failure from missing Z_STRVAL_PP
Anatol Belski [Tue, 4 Feb 2014 09:39:18 +0000 (10:39 +0100)]
updated NEWS
Anatol Belski [Tue, 4 Feb 2014 09:38:46 +0000 (10:38 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Anatol Belski [Tue, 4 Feb 2014 09:38:17 +0000 (10:38 +0100)]
updated NEWS
Anatol Belski [Tue, 4 Feb 2014 09:34:51 +0000 (10:34 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
pcre tests go with 8.34 upgrade
Anatol Belski [Tue, 4 Feb 2014 09:34:11 +0000 (10:34 +0100)]
pcre tests go with 8.34 upgrade
Anatol Belski [Tue, 4 Feb 2014 09:31:52 +0000 (10:31 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
pcre upgraded to 8.34
Anatol Belski [Tue, 4 Feb 2014 09:31:07 +0000 (10:31 +0100)]
pcre upgraded to 8.34
Ferenc Kovacs [Mon, 3 Feb 2014 03:20:16 +0000 (04:20 +0100)]
mention the openssl SPKAC functions commited to master before branching out 5.6. see https://github.com/php/php-src/pull/267
krakjoe [Sun, 2 Feb 2014 15:14:25 +0000 (15:14 +0000)]
windows
krakjoe [Sun, 2 Feb 2014 15:10:17 +0000 (15:10 +0000)]
clean symbols
krakjoe [Sun, 2 Feb 2014 14:58:39 +0000 (14:58 +0000)]
another patch from upstream
krakjoe [Sun, 2 Feb 2014 14:50:32 +0000 (14:50 +0000)]
woops
krakjoe [Sun, 2 Feb 2014 14:42:31 +0000 (14:42 +0000)]
better use of tmpnam/mkstemp
krakjoe [Sun, 2 Feb 2014 14:04:47 +0000 (14:04 +0000)]
update version
krakjoe [Sun, 2 Feb 2014 13:43:43 +0000 (13:43 +0000)]
remove use of zend directly, avoid leaks/bugs in modules etc
krakjoe [Sun, 2 Feb 2014 13:42:01 +0000 (13:42 +0000)]
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
Daniel Lowrey [Sat, 1 Feb 2014 15:01:13 +0000 (08:01 -0700)]
Remove #if PHP_VERSION_ID version checks
Daniel Lowrey [Fri, 31 Jan 2014 21:18:31 +0000 (14:18 -0700)]
Use master-agnostic zend_is_true checks
Dmitry Panin [Mon, 3 Feb 2014 17:49:54 +0000 (09:49 -0800)]
Make html_table_gen consistent with html_table.h
In commit
6dabd7de04ae3ed the html_table.h was changed manually,
without changing the underlying generator (html_table_gen.php).
This commit fixes it.
Christopher Jones [Tue, 11 Feb 2014 01:04:38 +0000 (17:04 -0800)]
Fix merge
Christopher Jones [Mon, 10 Feb 2014 23:00:42 +0000 (15:00 -0800)]
Add Oracle PL/SQL BOOLEAN type support to oci_bind_by_name()
Sara Golemon [Thu, 30 Jan 2014 10:06:30 +0000 (02:06 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Make html_table_gen consistent with html_table.h
Christopher Jones [Tue, 11 Feb 2014 01:04:55 +0000 (17:04 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix merge
Christopher Jones [Mon, 10 Feb 2014 23:01:37 +0000 (15:01 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Add Oracle PL/SQL BOOLEAN type support to oci_bind_by_name()
Derick Rethans [Sun, 9 Feb 2014 20:57:54 +0000 (15:57 -0500)]
Merge branch 'PHP-5.6'
Nuno Lopes [Sat, 8 Feb 2014 11:54:27 +0000 (06:54 -0500)]
fix regex to detect valgrind version
New PCRE version got stricter
Bob Weinand [Thu, 6 Feb 2014 20:32:11 +0000 (21:32 +0100)]
Merge branch 'PHP-5.6'
Bob Weinand [Thu, 6 Feb 2014 13:48:56 +0000 (14:48 +0100)]
Merge branch 'PHP-5.6'
Anatol Belski [Thu, 6 Feb 2014 08:18:22 +0000 (09:18 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated libs_version.txt
updated libs_version.txt
update libs_version.txt
Anatol Belski [Wed, 5 Feb 2014 19:14:19 +0000 (20:14 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
more tests for ICU >= 52.1 compat
fix tests for ICU >= 52.1
Anatol Belski [Wed, 5 Feb 2014 18:16:14 +0000 (19:16 +0100)]
fix tests for ICU >= 52.1
Hannes Magnusson [Wed, 5 Feb 2014 18:18:10 +0000 (10:18 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix year
Anatol Belski [Wed, 5 Feb 2014 14:17:48 +0000 (15:17 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
adapt test to curl 7.35.0 upgrade
Anatol Belski [Wed, 5 Feb 2014 09:52:17 +0000 (10:52 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
move the NEWS entry into the right section
Daniel Lowrey [Wed, 5 Feb 2014 02:13:50 +0000 (19:13 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed SNI failure from missing Z_STRVAL_PP
Anatol Belski [Tue, 4 Feb 2014 09:39:46 +0000 (10:39 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
Anatol Belski [Tue, 4 Feb 2014 09:35:19 +0000 (10:35 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
pcre tests go with 8.34 upgrade
Anatol Belski [Tue, 4 Feb 2014 09:32:09 +0000 (10:32 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
pcre upgraded to 8.34
Ferenc Kovacs [Mon, 3 Feb 2014 03:21:27 +0000 (04:21 +0100)]
Merge branch 'PHP-5.6'
krakjoe [Sun, 2 Feb 2014 15:14:53 +0000 (15:14 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
windows
krakjoe [Sun, 2 Feb 2014 15:10:28 +0000 (15:10 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
clean symbols
krakjoe [Sun, 2 Feb 2014 14:59:30 +0000 (14:59 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
another patch from upstream
krakjoe [Sun, 2 Feb 2014 14:50:43 +0000 (14:50 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
woops
krakjoe [Sun, 2 Feb 2014 14:42:54 +0000 (14:42 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
better use of tmpnam/mkstemp
krakjoe [Sun, 2 Feb 2014 14:05:03 +0000 (14:05 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update version
krakjoe [Sun, 2 Feb 2014 13:51:05 +0000 (13:51 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
remove use of zend directly, avoid leaks/bugs in modules etc
krakjoe [Sun, 2 Feb 2014 13:50:54 +0000 (13:50 +0000)]
Merge branch 'master' of https://git.php.net/repository/php-src
Daniel Lowrey [Sat, 1 Feb 2014 15:25:01 +0000 (08:25 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Remove #if PHP_VERSION_ID version checks
Conflicts:
ext/openssl/xp_ssl.c
Daniel Lowrey [Sat, 1 Feb 2014 15:13:53 +0000 (08:13 -0700)]
Remove #if PHP_VERSION_ID version checks
Daniel Lowrey [Fri, 31 Jan 2014 21:22:35 +0000 (14:22 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Use master-agnostic zend_is_true checks
Conflicts:
ext/openssl/xp_ssl.c
Sara Golemon [Thu, 30 Jan 2014 10:05:49 +0000 (02:05 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Make html_table_gen consistent with html_table.h
Dmitry Panin [Mon, 3 Feb 2014 17:49:54 +0000 (09:49 -0800)]
Make html_table_gen consistent with html_table.h
In commit
6dabd7de04ae3ed the html_table.h was changed manually,
without changing the underlying generator (html_table_gen.php).
This commit fixes it.
Anatol Belski [Thu, 30 Jan 2014 09:47:58 +0000 (10:47 +0100)]
fix ZTS build
Stanislav Malyshev [Thu, 30 Jan 2014 07:48:44 +0000 (23:48 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
tests still failing, so xfail for now until fixed
tests still failing, so xfail for now until fixed
tests still failing, so xfail for now until fixed
Stanislav Malyshev [Thu, 30 Jan 2014 01:40:39 +0000 (17:40 -0800)]
tests still failing, so xfail for now until fixed
Stanislav Malyshev [Thu, 30 Jan 2014 07:48:34 +0000 (23:48 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
tests still failing, so xfail for now until fixed
tests still failing, so xfail for now until fixed