]>
granicus.if.org Git - php/log
David Soria Parra [Tue, 9 Apr 2013 18:34:50 +0000 (20:34 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
NEWS section for next beta
NEWS for PHP 5.5.0 Beta 3
David Soria Parra [Tue, 9 Apr 2013 18:27:22 +0000 (20:27 +0200)]
NEWS section for next beta
David Soria Parra [Tue, 9 Apr 2013 18:26:58 +0000 (20:26 +0200)]
NEWS for PHP 5.5.0 Beta 3
Dmitry Stogov [Tue, 9 Apr 2013 13:49:45 +0000 (17:49 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed CFG construction bugs
Dmitry Stogov [Tue, 9 Apr 2013 13:48:45 +0000 (17:48 +0400)]
Fixed CFG construction bugs
Dmitry Stogov [Tue, 9 Apr 2013 08:11:26 +0000 (12:11 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
fix possible NULL deref
Dmitry Stogov [Tue, 9 Apr 2013 08:10:54 +0000 (12:10 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
fix possible NULL deref
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
Dmitry Stogov [Tue, 9 Apr 2013 08:10:06 +0000 (12:10 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
Pierre Joye [Tue, 9 Apr 2013 08:09:54 +0000 (10:09 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix possible NULL deref
Pierre Joye [Tue, 9 Apr 2013 08:09:47 +0000 (10:09 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix possible NULL deref
Pierre Joye [Tue, 9 Apr 2013 08:09:36 +0000 (10:09 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix possible NULL deref
Dmitry Stogov [Tue, 9 Apr 2013 08:09:33 +0000 (12:09 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed ZTS build
Pierre Joye [Tue, 9 Apr 2013 08:09:17 +0000 (10:09 +0200)]
fix possible NULL deref
Pierre Joye [Tue, 9 Apr 2013 08:06:49 +0000 (10:06 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Pierre Joye [Tue, 9 Apr 2013 08:06:00 +0000 (10:06 +0200)]
Merge branch 'master' of git.php.net:php-src
Pierre Joye [Tue, 9 Apr 2013 08:04:41 +0000 (10:04 +0200)]
Merge branch 'PHP-5.5'
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.5:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
Pierre Joye [Tue, 9 Apr 2013 08:04:32 +0000 (10:04 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.4:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
Pierre Joye [Tue, 9 Apr 2013 08:04:17 +0000 (10:04 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.3:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
Pierre Joye [Tue, 9 Apr 2013 08:04:01 +0000 (10:04 +0200)]
fix null deref
Dmitry Stogov [Tue, 9 Apr 2013 08:03:41 +0000 (12:03 +0400)]
Fixed ZTS build
Dmitry Stogov [Tue, 9 Apr 2013 07:59:30 +0000 (11:59 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed issue #26 (added opcache_invalidate(string $filename [, bool $force = false]) function)
Dmitry Stogov [Tue, 9 Apr 2013 07:57:28 +0000 (11:57 +0400)]
Fixed issue #26 (added opcache_invalidate(string $filename [, bool $force = false]) function)
Dmitry Stogov [Tue, 9 Apr 2013 06:53:12 +0000 (10:53 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed issue #82 (allow comments in blacklist file, lines started with ";")
Dmitry Stogov [Tue, 9 Apr 2013 06:51:19 +0000 (10:51 +0400)]
Fixed issue #82 (allow comments in blacklist file, lines started with ";")
Pierre Joye [Tue, 9 Apr 2013 05:05:03 +0000 (07:05 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
ws and comment for recommended aa method
Pierre Joye [Tue, 9 Apr 2013 05:04:52 +0000 (07:04 +0200)]
ws and comment for recommended aa method
Pierre Joye [Tue, 9 Apr 2013 04:47:21 +0000 (06:47 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Pierre Joye [Tue, 9 Apr 2013 04:46:58 +0000 (06:46 +0200)]
Merge branch 'master' of git.php.net:php-src
Pierre Joye [Tue, 9 Apr 2013 04:45:24 +0000 (06:45 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix some unitialized values and typo
Pierre Joye [Tue, 9 Apr 2013 04:44:45 +0000 (06:44 +0200)]
fix some unitialized values and typo
Anatol Belski [Mon, 8 Apr 2013 14:24:32 +0000 (16:24 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
updated libmagic.patch
Anatol Belski [Mon, 8 Apr 2013 14:24:20 +0000 (16:24 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated libmagic.patch
Anatol Belski [Mon, 8 Apr 2013 14:23:43 +0000 (16:23 +0200)]
updated libmagic.patch
Anatol Belski [Mon, 8 Apr 2013 13:52:07 +0000 (15:52 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix ident
Anatol Belski [Mon, 8 Apr 2013 13:51:53 +0000 (15:51 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix ident
Anatol Belski [Mon, 8 Apr 2013 13:51:22 +0000 (15:51 +0200)]
fix ident
Anatol Belski [Mon, 8 Apr 2013 12:34:21 +0000 (14:34 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Refactored the previous memleak fix
Anatol Belski [Mon, 8 Apr 2013 12:34:09 +0000 (14:34 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Refactored the previous memleak fix
Anatol Belski [Mon, 8 Apr 2013 12:32:37 +0000 (14:32 +0200)]
Refactored the previous memleak fix
to avoid usage of a freed pointer. Thanks Laruence )
Anatol Belski [Mon, 8 Apr 2013 10:50:47 +0000 (12:50 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix memory leak at apprentice.c:1095
Anatol Belski [Mon, 8 Apr 2013 10:50:25 +0000 (12:50 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix memory leak at apprentice.c:1095
Anatol Belski [Mon, 8 Apr 2013 10:49:53 +0000 (12:49 +0200)]
fix memory leak at apprentice.c:1095
Anatol Belski [Mon, 8 Apr 2013 07:21:20 +0000 (09:21 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fixed EOL
Anatol Belski [Mon, 8 Apr 2013 07:21:06 +0000 (09:21 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed EOL
Anatol Belski [Mon, 8 Apr 2013 07:20:43 +0000 (09:20 +0200)]
fixed EOL
Anatol Belski [Sun, 7 Apr 2013 20:20:57 +0000 (22:20 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
updated NEWS
upgraded libmagic to 5.14
leave a sane environment behind (even if empty) when exiting some OS atexit() handlers call getenv()
Anatol Belski [Sun, 7 Apr 2013 20:20:12 +0000 (22:20 +0200)]
updated NEWS
Anatol Belski [Sun, 7 Apr 2013 20:18:53 +0000 (22:18 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
upgraded libmagic to 5.14
Anatol Belski [Sun, 7 Apr 2013 20:15:56 +0000 (22:15 +0200)]
upgraded libmagic to 5.14
Nuno Lopes [Sun, 7 Apr 2013 06:32:20 +0000 (02:32 -0400)]
leave a sane environment behind (even if empty) when exiting
some OS atexit() handlers call getenv()
Nuno Lopes [Sun, 7 Apr 2013 06:32:20 +0000 (02:32 -0400)]
leave a sane environment behind (even if empty) when exiting
some OS atexit() handlers call getenv()
Xinchen Hui [Fri, 5 Apr 2013 15:28:23 +0000 (23:28 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Fri, 5 Apr 2013 15:28:02 +0000 (23:28 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Carson McDonald [Fri, 5 Apr 2013 14:53:13 +0000 (10:53 -0400)]
Fix typo
Xinchen Hui [Fri, 5 Apr 2013 13:35:41 +0000 (21:35 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Fri, 5 Apr 2013 13:35:09 +0000 (21:35 +0800)]
Drop support for bison < 2.4 when building PHP from GIT source
Xinchen Hui [Fri, 5 Apr 2013 06:28:27 +0000 (14:28 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Fri, 5 Apr 2013 06:27:56 +0000 (14:27 +0800)]
Contant has been renamed
Xinchen Hui [Fri, 5 Apr 2013 06:27:29 +0000 (14:27 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Fri, 5 Apr 2013 06:25:54 +0000 (14:25 +0800)]
Constant has been renamed
Rasmus Lerdorf [Fri, 5 Apr 2013 02:24:12 +0000 (19:24 -0700)]
Fixed bugs #47675 and #64577 (fd leak on Solaris)
Rasmus Lerdorf [Fri, 5 Apr 2013 02:23:22 +0000 (19:23 -0700)]
Fixed bugs #47675 and #64577 (fd leak on Solaris)
Rasmus Lerdorf [Fri, 5 Apr 2013 02:22:28 +0000 (19:22 -0700)]
Fixed bugs #47675 and #64577 (fd leak on Solaris)
Rasmus Lerdorf [Fri, 5 Apr 2013 02:15:52 +0000 (19:15 -0700)]
Fixed bugs #47675 and #64577 (fd leak on Solaris)
Johannes Schlüter [Thu, 4 Apr 2013 13:38:35 +0000 (15:38 +0200)]
Merge branch 'PHP-5.5'
Johannes Schlüter [Wed, 3 Apr 2013 08:59:37 +0000 (10:59 +0200)]
Improve warning when trying to load zend ext as PHP module
Xinchen Hui [Thu, 4 Apr 2013 11:31:21 +0000 (19:31 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Thu, 4 Apr 2013 11:31:14 +0000 (19:31 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
ext/curl/interface.c
Xinchen Hui [Thu, 4 Apr 2013 11:28:17 +0000 (19:28 +0800)]
s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ENABLED,
Xinchen Hui [Thu, 4 Apr 2013 06:56:10 +0000 (14:56 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Thu, 4 Apr 2013 06:56:00 +0000 (14:56 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 4 Apr 2013 06:55:17 +0000 (14:55 +0800)]
Update test script to make sure the error occurred
Xinchen Hui [Thu, 4 Apr 2013 06:53:30 +0000 (14:53 +0800)]
no tab here
Xinchen Hui [Thu, 4 Apr 2013 06:53:17 +0000 (14:53 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 4 Apr 2013 06:53:06 +0000 (14:53 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 4 Apr 2013 06:52:59 +0000 (14:52 +0800)]
no tab here
Xinchen Hui [Thu, 4 Apr 2013 06:52:27 +0000 (14:52 +0800)]
no tab here
Xinchen Hui [Thu, 4 Apr 2013 06:49:58 +0000 (14:49 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Thu, 4 Apr 2013 06:49:22 +0000 (14:49 +0800)]
Update NEWs
Xinchen Hui [Thu, 4 Apr 2013 06:48:53 +0000 (14:48 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 4 Apr 2013 06:47:49 +0000 (14:47 +0800)]
Use 5.4 specifical warnnig & Update NEWs
Xinchen Hui [Thu, 4 Apr 2013 06:44:28 +0000 (14:44 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 4 Apr 2013 06:34:11 +0000 (14:34 +0800)]
Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: segfault)
Xinchen Hui [Thu, 4 Apr 2013 05:40:46 +0000 (13:40 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 4 Apr 2013 05:40:21 +0000 (13:40 +0800)]
Fixed Bug #64578
Nikita Popov [Wed, 3 Apr 2013 18:30:31 +0000 (20:30 +0200)]
Merge branch 'PHP-5.5'
Nikita Popov [Wed, 3 Apr 2013 18:29:19 +0000 (20:29 +0200)]
Fix bug #64555: foreach no longer copies keys if they are interned
Xinchen Hui [Wed, 3 Apr 2013 11:52:56 +0000 (19:52 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Wed, 3 Apr 2013 11:52:09 +0000 (19:52 +0800)]
Fix test due to opcache
Xinchen Hui [Wed, 3 Apr 2013 10:51:44 +0000 (18:51 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Wed, 3 Apr 2013 10:51:19 +0000 (18:51 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
ptarjan [Wed, 3 Apr 2013 02:24:11 +0000 (19:24 -0700)]
Fix #64572: Clean up after the test
Lets not leave stuff lying around.
ptarjan [Wed, 3 Apr 2013 02:24:11 +0000 (19:24 -0700)]
Fix #64572: Clean up after the test
Lets not leave stuff lying around.
Xinchen Hui [Wed, 3 Apr 2013 02:21:24 +0000 (10:21 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Wed, 3 Apr 2013 02:21:06 +0000 (10:21 +0800)]
format
Xinchen Hui [Wed, 3 Apr 2013 02:20:52 +0000 (10:20 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Wed, 3 Apr 2013 02:20:13 +0000 (10:20 +0800)]
format
Xinchen Hui [Wed, 3 Apr 2013 02:17:49 +0000 (10:17 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Wed, 3 Apr 2013 02:17:27 +0000 (10:17 +0800)]
Update NEWS & UPGRADING
Xinchen Hui [Wed, 3 Apr 2013 02:15:41 +0000 (10:15 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
ext/curl/interface.c
projects / php / log