]>
granicus.if.org Git - php/log
Dmitry Stogov [Thu, 22 Jan 2015 08:50:42 +0000 (11:50 +0300)]
zend_read_property() has to provide a holder for return value.
Previously it was possible that zend_read_property() returned pointer to zval allocated on stack.
Xinchen Hui [Thu, 22 Jan 2015 08:39:22 +0000 (16:39 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Thu, 22 Jan 2015 08:39:03 +0000 (16:39 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Thu, 22 Jan 2015 08:38:34 +0000 (16:38 +0800)]
Fixed segfault while running with moodle
Popa Adrian Marius [Thu, 22 Jan 2015 08:16:51 +0000 (10:16 +0200)]
Revert "Remove Jouni Ahto from maintainers and files as requested , anyway we have git blame/history"
This reverts commit
7cf1450df14b8da0c3c255470ebe4c237fb49b88 .
Bob Weinand [Wed, 21 Jan 2015 22:54:03 +0000 (23:54 +0100)]
Forgot to add test...
Bob Weinand [Wed, 21 Jan 2015 22:52:48 +0000 (23:52 +0100)]
Removed efree() on arena_alloc()ed memory
Rasmus Lerdorf [Wed, 21 Jan 2015 19:39:23 +0000 (11:39 -0800)]
Slightly modify and merge PR#105 from @MegaManSec
Rasmus Lerdorf [Wed, 21 Jan 2015 19:39:23 +0000 (11:39 -0800)]
Slightly modify and merge PR#105 from @MegaManSec
Popa Adrian Marius [Wed, 21 Jan 2015 16:08:56 +0000 (18:08 +0200)]
Remove Jouni Ahto from maintainers and files as requested , anyway we have git blame/history
Anatol Belski [Wed, 21 Jan 2015 15:26:36 +0000 (16:26 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix timelib build configuration
Conflicts:
ext/date/config.w32
ext/date/config0.m4
win32/build/config.w32
win32/build/config.w32.phpize.in
Anatol Belski [Wed, 21 Jan 2015 15:22:23 +0000 (16:22 +0100)]
fix timelib build configuration
Anatol Belski [Wed, 21 Jan 2015 12:55:07 +0000 (13:55 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
make timelib_config.h inclusion configurable
Conflicts:
win32/build/config.w32
win32/build/config.w32.phpize.in
Anatol Belski [Wed, 21 Jan 2015 12:48:38 +0000 (13:48 +0100)]
make timelib_config.h inclusion configurable
Julien Pauli [Wed, 21 Jan 2015 10:14:33 +0000 (11:14 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS
Julien Pauli [Wed, 21 Jan 2015 10:13:55 +0000 (11:13 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Julien Pauli [Wed, 21 Jan 2015 10:10:20 +0000 (11:10 +0100)]
Updated NEWS
Anatol Belski [Wed, 21 Jan 2015 10:04:02 +0000 (11:04 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
backported the timelib cleanups to 5.6
Anatol Belski [Wed, 21 Jan 2015 10:03:16 +0000 (11:03 +0100)]
backported the timelib cleanups to 5.6
Anatol Belski [Wed, 21 Jan 2015 09:49:28 +0000 (10:49 +0100)]
make timelib use PHP's defines when it's inside PHP only
otherwise system defines will be used
Anatol Belski [Wed, 21 Jan 2015 08:42:19 +0000 (09:42 +0100)]
decouple timelib from php_stdint.h
Rasmus Lerdorf [Wed, 21 Jan 2015 07:56:51 +0000 (23:56 -0800)]
Fix the most obvious issues here.
There are other problems though
Rasmus Lerdorf [Wed, 21 Jan 2015 07:40:33 +0000 (23:40 -0800)]
PHP7 API updates
Rasmus Lerdorf [Wed, 21 Jan 2015 07:11:22 +0000 (23:11 -0800)]
int -> size_t and long -> zend_long
Rasmus Lerdorf [Wed, 21 Jan 2015 07:00:40 +0000 (23:00 -0800)]
int -> size_t
and fix the variable name
Rasmus Lerdorf [Wed, 21 Jan 2015 06:58:31 +0000 (22:58 -0800)]
int -> size_t
Rasmus Lerdorf [Wed, 21 Jan 2015 06:53:11 +0000 (22:53 -0800)]
int -> size_t
Rasmus Lerdorf [Wed, 21 Jan 2015 06:51:09 +0000 (22:51 -0800)]
int -> size_t
Rasmus Lerdorf [Wed, 21 Jan 2015 06:50:17 +0000 (22:50 -0800)]
int -> size_t
Rasmus Lerdorf [Wed, 21 Jan 2015 06:45:07 +0000 (22:45 -0800)]
int -> size_t
Rasmus Lerdorf [Wed, 21 Jan 2015 06:41:18 +0000 (22:41 -0800)]
Missed removing a couple of _len vars
Xinchen Hui [Wed, 21 Jan 2015 04:03:19 +0000 (12:03 +0800)]
Fixed valgrind reported issue with setlocale
Xinchen Hui [Wed, 21 Jan 2015 03:18:27 +0000 (11:18 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Wed, 21 Jan 2015 03:18:08 +0000 (11:18 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Wed, 21 Jan 2015 03:17:49 +0000 (11:17 +0800)]
Fixed test fails
Ferenc Kovacs [Wed, 21 Jan 2015 00:20:10 +0000 (01:20 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix NEWS
Ferenc Kovacs [Wed, 21 Jan 2015 00:19:31 +0000 (01:19 +0100)]
fix NEWS
Rasmus Lerdorf [Tue, 20 Jan 2015 23:43:08 +0000 (15:43 -0800)]
Finishing porting ext/imap to PHP7
All tests pass now
Derick Rethans [Tue, 20 Jan 2015 21:44:36 +0000 (21:44 +0000)]
Merge branch 'PHP-5.6'
Derick Rethans [Tue, 20 Jan 2015 21:44:25 +0000 (21:44 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Tue, 20 Jan 2015 21:44:19 +0000 (21:44 +0000)]
Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)
Stanislav Malyshev [Tue, 20 Jan 2015 21:27:51 +0000 (13:27 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix year
Stanislav Malyshev [Tue, 20 Jan 2015 21:27:38 +0000 (13:27 -0800)]
fix year
Stanislav Malyshev [Tue, 20 Jan 2015 19:58:04 +0000 (11:58 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS
format
add CVE
Stanislav Malyshev [Tue, 20 Jan 2015 19:57:50 +0000 (11:57 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
format
Stanislav Malyshev [Tue, 20 Jan 2015 19:57:39 +0000 (11:57 -0800)]
update NEWS
Stanislav Malyshev [Tue, 20 Jan 2015 19:57:17 +0000 (11:57 -0800)]
format
Stanislav Malyshev [Tue, 20 Jan 2015 19:55:04 +0000 (11:55 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add CVE
Stanislav Malyshev [Tue, 20 Jan 2015 19:54:45 +0000 (11:54 -0800)]
add CVE
Anatol Belski [Tue, 20 Jan 2015 19:52:12 +0000 (20:52 +0100)]
don't error x86 compiler
Anatol Belski [Tue, 20 Jan 2015 19:46:45 +0000 (20:46 +0100)]
fix leaking of locale_string in TS build
actually more like an attempt as i see the leaks on travis,
but don't repro on my boxes
Stanislav Malyshev [Tue, 20 Jan 2015 19:47:46 +0000 (11:47 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add protection against nulls
Conflicts:
main/spprintf.c
Stanislav Malyshev [Tue, 20 Jan 2015 19:47:06 +0000 (11:47 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add protection against nulls
Stanislav Malyshev [Tue, 20 Jan 2015 19:46:39 +0000 (11:46 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add protection against nulls
Stanislav Malyshev [Tue, 20 Jan 2015 19:46:10 +0000 (11:46 -0800)]
add protection against nulls
Stanislav Malyshev [Tue, 20 Jan 2015 18:41:59 +0000 (10:41 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
5.4.38 next
Updated NEWS
Updated NEWS
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
Fix bug #68799: Free called on unitialized pointer
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
Conflicts:
ext/exif/exif.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
Stanislav Malyshev [Tue, 20 Jan 2015 18:40:39 +0000 (10:40 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.4.38 next
Fix bug #68799: Free called on unitialized pointer
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
Conflicts:
ext/standard/var_unserializer.c
Stanislav Malyshev [Tue, 20 Jan 2015 18:40:11 +0000 (10:40 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.38 next
Fix bug #68799: Free called on unitialized pointer
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Tue, 20 Jan 2015 18:38:33 +0000 (10:38 -0800)]
5.4.38 next
Anatol Belski [Tue, 20 Jan 2015 15:52:49 +0000 (16:52 +0100)]
fix premature freeing of BG(locale_string)
the returned string has to be refcounted
Julien Pauli [Tue, 20 Jan 2015 14:11:19 +0000 (15:11 +0100)]
Updated NEWS
Joshua Rogers [Fri, 16 Jan 2015 12:10:54 +0000 (23:10 +1100)]
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
Julien Pauli [Tue, 20 Jan 2015 14:09:59 +0000 (15:09 +0100)]
Updated NEWS
Julien Pauli [Tue, 20 Jan 2015 14:09:34 +0000 (15:09 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
Julien Pauli [Tue, 20 Jan 2015 14:09:13 +0000 (15:09 +0100)]
Updated NEWS
Xinchen Hui [Tue, 20 Jan 2015 13:50:31 +0000 (21:50 +0800)]
Optimized range
Joshua Rogers [Fri, 16 Jan 2015 12:10:54 +0000 (23:10 +1100)]
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
Anatol Belski [Tue, 20 Jan 2015 10:30:03 +0000 (11:30 +0100)]
fix declaration
Stanislav Malyshev [Tue, 20 Jan 2015 09:00:52 +0000 (01:00 -0800)]
Merge branch 'bug68710' into PHP-5.4
* bug68710:
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
Stanislav Malyshev [Tue, 20 Jan 2015 08:57:55 +0000 (00:57 -0800)]
Merge branch 'bug68799' into PHP-5.4
* bug68799:
Fix bug #68799: Free called on unitialized pointer
Xinchen Hui [Tue, 20 Jan 2015 08:51:20 +0000 (16:51 +0800)]
NUM_KEY is useless here
Dmitry Stogov [Tue, 20 Jan 2015 05:56:09 +0000 (08:56 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Update remaining octal 32-bit tests
Dmitry Stogov [Tue, 20 Jan 2015 05:55:36 +0000 (08:55 +0300)]
cleanup
Andrea Faulds [Tue, 20 Jan 2015 05:54:13 +0000 (05:54 +0000)]
Update remaining octal 32-bit tests
Xinchen Hui [Tue, 20 Jan 2015 04:02:35 +0000 (12:02 +0800)]
Unused parse_arg_object_to_string
Xinchen Hui [Tue, 20 Jan 2015 03:58:40 +0000 (11:58 +0800)]
Unused var
Xinchen Hui [Tue, 20 Jan 2015 02:59:28 +0000 (10:59 +0800)]
Use zend_string in case we will optimize them
Xinchen Hui [Tue, 20 Jan 2015 02:11:48 +0000 (10:11 +0800)]
Remove addslashes_str
Derick Rethans [Mon, 19 Jan 2015 22:59:41 +0000 (22:59 +0000)]
Merge branch 'PHP-5.6'
Derick Rethans [Mon, 19 Jan 2015 22:59:31 +0000 (22:59 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Mon, 19 Jan 2015 22:59:24 +0000 (22:59 +0000)]
Fixed bug #45081 (strtotime incorrectly interprets SGT time zone).
Sara Golemon [Mon, 19 Jan 2015 16:39:52 +0000 (08:39 -0800)]
Provide compiler hook for altering the AST pre-compilation.
Stanislav Malyshev [Mon, 19 Jan 2015 18:05:57 +0000 (10:05 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #50224 where float without decimals were converted to integer
Updated NEWS for #68371
Xinchen Hui [Mon, 19 Jan 2015 15:46:59 +0000 (10:46 -0500)]
Remove dead codes
Xinchen Hui [Mon, 19 Jan 2015 15:46:39 +0000 (10:46 -0500)]
Optimized php_addslashes
Xinchen Hui [Mon, 19 Jan 2015 14:12:44 +0000 (09:12 -0500)]
Merge branch 'master' of https://git.php.net/repository/php-src
Nikita Popov [Mon, 19 Jan 2015 14:12:51 +0000 (15:12 +0100)]
Revert "Remove static calls from incompatible $this context"
This reverts commit
dc9991b167533c7ee13ff96da6048988e6e31bc2 .
Xinchen Hui [Mon, 19 Jan 2015 14:10:01 +0000 (09:10 -0500)]
Optimized is_a
Dmitry Stogov [Mon, 19 Jan 2015 14:02:17 +0000 (17:02 +0300)]
Generate better code for comparisons with boolean constants
Dmitry Stogov [Mon, 19 Jan 2015 14:01:30 +0000 (17:01 +0300)]
Improve optimization of CONCAT/ADD_STRING/ADD_CJAR sequences
Xinchen Hui [Mon, 19 Jan 2015 13:06:03 +0000 (08:06 -0500)]
Micro optimization for array_diff
Xinchen Hui [Mon, 19 Jan 2015 12:45:30 +0000 (07:45 -0500)]
Optimized trim for what_len == 1
Dmitry Stogov [Mon, 19 Jan 2015 12:26:04 +0000 (15:26 +0300)]
old_size is already known
Dmitry Stogov [Mon, 19 Jan 2015 10:27:44 +0000 (13:27 +0300)]
Optimize code generated for "while" and "for" loops.
Eliminate one JMP opcode for each loop iteration.
Juan Basso [Sat, 29 Mar 2014 23:41:48 +0000 (19:41 -0400)]
Fixed bug #50224 where float without decimals were converted to integer
Xinchen Hui [Mon, 19 Jan 2015 08:32:28 +0000 (03:32 -0500)]
Only use explicit ">" in sorting algo
Xinchen Hui [Mon, 19 Jan 2015 06:37:13 +0000 (01:37 -0500)]
Merge branch 'master' of https://git.php.net/repository/php-src
Stanislav Malyshev [Mon, 19 Jan 2015 06:43:32 +0000 (22:43 -0800)]
fix size & compilation on Darwin
Xinchen Hui [Mon, 19 Jan 2015 06:04:23 +0000 (01:04 -0500)]
Don't use >= as sorting condition
which could avoid breaking usage like:
usort($a, function($a, $b) { return $a > $b; })
Andrea Faulds [Mon, 19 Jan 2015 05:55:55 +0000 (05:55 +0000)]
Move intdiv() UPGRADING entry to New Functions