]>
granicus.if.org Git - php/log
Ferenc Kovacs [Mon, 26 Jan 2015 10:14:15 +0000 (11:14 +0100)]
add a custom built pear installer until we have an official release with php7 compat. see https://github.com/pear/pear-core/pull/33 for the details
Ferenc Kovacs [Mon, 26 Jan 2015 10:09:53 +0000 (11:09 +0100)]
Revert "Disable PEAR by default"
This reverts commit
df984ad4f5e4e53e3f8bdafc7d620fd8112a121c .
Dmitry Stogov [Mon, 26 Jan 2015 09:24:33 +0000 (12:24 +0300)]
Fixed use after free
Dmitry Stogov [Mon, 26 Jan 2015 08:25:05 +0000 (11:25 +0300)]
Fixed bug #68896 (Changing ArrayObject value cause Segment Fault)
Xinchen Hui [Mon, 26 Jan 2015 06:41:45 +0000 (14:41 +0800)]
Fixed ext/standard/tests/general_functions/bug41970.phpt fails
Nikita Popov [Sun, 25 Jan 2015 13:48:54 +0000 (14:48 +0100)]
Disable PEAR by default
Given how it doesn't work and it doesn't seem like it will start
working in the immediate future.
Stanislav Malyshev [Sun, 25 Jan 2015 08:04:18 +0000 (00:04 -0800)]
map fixes
Stanislav Malyshev [Sat, 24 Jan 2015 22:14:53 +0000 (14:14 -0800)]
Fix the fix for #68884
Rasmus Lerdorf [Sun, 25 Jan 2015 00:05:42 +0000 (16:05 -0800)]
These tests all have intentional circular references
and they will leak and cause failures unless gc is enabled
Nikita Popov [Sat, 24 Jan 2015 22:11:05 +0000 (23:11 +0100)]
Fix resource leak when casting to string
Nikita Popov [Sat, 24 Jan 2015 20:50:04 +0000 (21:50 +0100)]
Fix declare encoding tests
Also add a test for bwoebi's last change.
Bob Weinand [Sat, 24 Jan 2015 19:00:46 +0000 (20:00 +0100)]
Fix segfault when no class ctx is defined
Nikita Popov [Sat, 24 Jan 2015 18:53:07 +0000 (19:53 +0100)]
Fix build
Bob Weinand [Sat, 24 Jan 2015 18:19:02 +0000 (19:19 +0100)]
Inline self-constants if possible at compile time
Xinchen Hui [Sat, 24 Jan 2015 14:51:37 +0000 (22:51 +0800)]
Fixed bug #68897 (Using variable for sort flag in array_multisort cause wrong results)
Márcio Almada [Sat, 24 Jan 2015 03:26:01 +0000 (00:26 -0300)]
remove unused var, make string.c compilation zero warnings
Anatol Belski [Fri, 23 Jan 2015 19:57:47 +0000 (20:57 +0100)]
Merge branch 'pull-request/1023'
Adam Harvey [Tue, 2 Dec 2014 20:18:18 +0000 (12:18 -0800)]
Make gc_collect_cycles hookable.
Dmitry Stogov [Fri, 23 Jan 2015 18:47:26 +0000 (21:47 +0300)]
Fixed memory leak
Dmitry Stogov [Fri, 23 Jan 2015 17:35:32 +0000 (20:35 +0300)]
Fixed memory leak
Anatol Belski [Fri, 23 Jan 2015 15:03:20 +0000 (16:03 +0100)]
cleanup TSRMLS_*
Dmitry Stogov [Fri, 23 Jan 2015 14:11:19 +0000 (17:11 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
C89 compat
Dmitry Stogov [Fri, 23 Jan 2015 14:10:05 +0000 (17:10 +0300)]
Fixed possible double free of class static members
Anatol Belski [Fri, 23 Jan 2015 14:04:29 +0000 (15:04 +0100)]
C89 compat
Dmitry Stogov [Fri, 23 Jan 2015 13:40:16 +0000 (16:40 +0300)]
It doesn't make sense to colect garbage after fatal errors
Dmitry Stogov [Fri, 23 Jan 2015 13:37:39 +0000 (16:37 +0300)]
Revert "Fixed ASSERTION"
This reverts commit
76f438e06fc61d32272a1f9877266c8d97d871ba .
Xinchen Hui [Fri, 23 Jan 2015 09:35:37 +0000 (17:35 +0800)]
Merge branch 'fix-strripos-memleak' of https://github.com/reeze/php-src
Reeze Xia [Fri, 23 Jan 2015 09:14:39 +0000 (17:14 +0800)]
Fix one more leak when wrong $needle type provide of strripos
Reeze Xia [Fri, 23 Jan 2015 08:53:58 +0000 (16:53 +0800)]
Fixed memory leak of strripos() when empty needle or haystack
Xinchen Hui [Fri, 23 Jan 2015 06:19:40 +0000 (14:19 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Fri, 23 Jan 2015 06:18:56 +0000 (14:18 +0800)]
Fixed ASSERTION
Daniel Lowrey [Fri, 23 Jan 2015 06:05:28 +0000 (01:05 -0500)]
NEWS
Daniel Lowrey [Fri, 23 Jan 2015 06:03:39 +0000 (01:03 -0500)]
Merge branch 'master' of https://github.com/bbroerman30/php-src
Conflicts:
ext/openssl/xp_ssl.c
Xinchen Hui [Fri, 23 Jan 2015 05:32:07 +0000 (13:32 +0800)]
Fixed refcount handling in get_class_vars()
Sara Golemon [Thu, 22 Jan 2015 22:04:49 +0000 (14:04 -0800)]
Add missing ZEND_API tag to declaration of `int zendparse();`
Ferenc Kovacs [Thu, 22 Jan 2015 20:29:03 +0000 (21:29 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix some factual errors in the process
Ferenc Kovacs [Thu, 22 Jan 2015 20:28:41 +0000 (21:28 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix some factual errors in the process
Ferenc Kovacs [Thu, 22 Jan 2015 20:28:21 +0000 (21:28 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix some factual errors in the process
Ferenc Kovacs [Thu, 22 Jan 2015 20:27:38 +0000 (21:27 +0100)]
fix some factual errors in the process
Dmitry Stogov [Thu, 22 Jan 2015 17:39:34 +0000 (20:39 +0300)]
Fixed compiler reenterability
Dmitry Stogov [Thu, 22 Jan 2015 17:38:42 +0000 (20:38 +0300)]
Fixed GC after destruction of object store.
Kalle Sommer Nielsen [Thu, 22 Jan 2015 14:15:02 +0000 (15:15 +0100)]
Remove Jouni (As requested) from the maintainers file of INTERBASE
Anatol Belski [Thu, 22 Jan 2015 14:00:50 +0000 (15:00 +0100)]
Fixed bug #68884 Null pointer deference
Dmitry Stogov [Thu, 22 Jan 2015 12:49:38 +0000 (15:49 +0300)]
define() must not modify the source array
Remi Collet [Thu, 22 Jan 2015 12:07:34 +0000 (13:07 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
move CVE to the right version
Remi Collet [Thu, 22 Jan 2015 12:06:50 +0000 (13:06 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
move CVE to the right version
Remi Collet [Thu, 22 Jan 2015 12:06:15 +0000 (13:06 +0100)]
move CVE to the right version
Anatol Belski [Thu, 22 Jan 2015 11:29:03 +0000 (12:29 +0100)]
Merge branch 'master' of git.php.net:php-src
Anatol Belski [Thu, 22 Jan 2015 11:28:11 +0000 (12:28 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifs
Anatol Belski [Thu, 22 Jan 2015 11:26:50 +0000 (12:26 +0100)]
Fixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifs
The fix for bug #67647 applies here, too.
Dmitry Stogov [Thu, 22 Jan 2015 11:24:27 +0000 (14:24 +0300)]
Fixed destruction of circular garbage
Anatol Belski [Thu, 22 Jan 2015 10:56:34 +0000 (11:56 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly
Conflicts:
ext/fileinfo/data_file.c
Anatol Belski [Thu, 22 Jan 2015 10:48:11 +0000 (11:48 +0100)]
Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly
Dmitry Stogov [Thu, 22 Jan 2015 09:59:53 +0000 (12:59 +0300)]
Fixed double free and cleanup
Anatol Belski [Thu, 22 Jan 2015 09:19:08 +0000 (10:19 +0100)]
Merge branch 'master' of git.php.net:php-src
Anatol Belski [Thu, 22 Jan 2015 09:17:45 +0000 (10:17 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
simplify error handling for dirs as magic
Anatol Belski [Thu, 22 Jan 2015 09:17:14 +0000 (10:17 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
simplify error handling for dirs as magic
Michael Wallner [Thu, 22 Jan 2015 09:12:06 +0000 (10:12 +0100)]
avoid duplicate array_init
custom request body handling firing the rfc1867 handler after the
environment has been hashed might create a memory leak by calling
array_init() twice on PG(http_globals)[TRACK_VARS_FILES]
Anatol Belski [Thu, 22 Jan 2015 09:16:13 +0000 (10:16 +0100)]
simplify error handling for dirs as magic
Anatol Belski [Thu, 22 Jan 2015 09:04:33 +0000 (10:04 +0100)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Anatol Belski [Thu, 22 Jan 2015 09:03:24 +0000 (10:03 +0100)]
Merge branch 'master' of git.php.net:php-src
Anatol Belski [Thu, 22 Jan 2015 09:02:05 +0000 (10:02 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #68827 Double free with disabled ZMM
Anatol Belski [Thu, 22 Jan 2015 09:01:16 +0000 (10:01 +0100)]
updated NEWS
Anatol Belski [Thu, 22 Jan 2015 09:00:10 +0000 (10:00 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68827 Double free with disabled ZMM
Fixed segfault while running with moodle
Joshua Rogers [Thu, 22 Jan 2015 08:59:13 +0000 (09:59 +0100)]
Fixed bug #68827 Double free with disabled ZMM
Xinchen Hui [Thu, 22 Jan 2015 08:55:53 +0000 (16:55 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Thu, 22 Jan 2015 08:55:20 +0000 (16:55 +0800)]
Revert "Fixed valgrind reported issue with setlocale"
This reverts commit
fa06343d7e0e04f4a660218f6dbb7ce18c3f090b .
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
Brad Broerman [Wed, 21 Jan 2015 15:20:32 +0000 (10:20 -0500)]
Renamed timeval functions to comply with PHP naming standards
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