]>
granicus.if.org Git - php/log
Michael Wallner [Fri, 13 Sep 2013 10:54:42 +0000 (12:54 +0200)]
fix broken sha2 configure tests
see http://patch-tracker.debian.org/patch/series/view/php5/5.5.3+dfsg-1/fix_broken_sha2_test.patch
Levi Morrison [Thu, 12 Sep 2013 21:26:51 +0000 (15:26 -0600)]
Fixed minor bug in test.
Nikita Popov [Thu, 12 Sep 2013 16:23:53 +0000 (18:23 +0200)]
Move NEWS entries to correct version
Accidentially inserted NEWS entries in previous release.
Nikita Popov [Thu, 12 Sep 2013 15:46:14 +0000 (17:46 +0200)]
Fix bug #64782: SplFileObject constructor make $context optional
Boro Sitnikovski [Wed, 11 Sep 2013 23:50:52 +0000 (01:50 +0200)]
Fix bug #65502: DateTimeImmutable::createFromFormat returns DateTime
DateTimeImmutable::createFromFormat should call
date_create_immutable_from_format instead of date_create_from_format
Boro Sitnikovski [Wed, 11 Sep 2013 23:15:54 +0000 (01:15 +0200)]
Fix bug #65548: Comparison for DateTimeImmutable doesn't work
Adam Harvey [Mon, 9 Sep 2013 23:58:35 +0000 (16:58 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Tinker with the wording of the short_open_tag description.
Adam Harvey [Mon, 9 Sep 2013 23:56:57 +0000 (16:56 -0700)]
Tinker with the wording of the short_open_tag description.
I'm still not thrilled with this, but it's a bit better and addresses the
issues noted in bug #65644. Plus, it now mentions the decoupling of <?=.
Adam Harvey [Mon, 9 Sep 2013 23:46:14 +0000 (16:46 -0700)]
Fix NEWS: these commits were after 5.5.4 was branched and will be in 5.5.5.
Adam Harvey [Mon, 9 Sep 2013 23:32:16 +0000 (16:32 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Handle CLI server request headers case insensitively.
5.4.21 now
Conflicts:
configure.in
main/php_version.h
Adam Harvey [Mon, 9 Sep 2013 23:24:49 +0000 (16:24 -0700)]
Handle CLI server request headers case insensitively.
Fixes bug #65633 (built-in server treat some http headers as case-sensitive).
unknown [Mon, 9 Sep 2013 09:56:05 +0000 (11:56 +0200)]
ensure that the defined interpolation method is used by the generic scaling functions
Dmitry Stogov [Mon, 9 Sep 2013 06:05:59 +0000 (10:05 +0400)]
Fixed issue #128 (opcache_invalidate segmentation fault)
Christopher Jones [Wed, 4 Sep 2013 12:40:24 +0000 (05:40 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
5.5.5 now
Julien Pauli [Wed, 4 Sep 2013 09:22:23 +0000 (11:22 +0200)]
5.5.5 now
Stanislav Malyshev [Tue, 3 Sep 2013 20:38:15 +0000 (13:38 -0700)]
5.4.21 now
Christopher Jones [Mon, 2 Sep 2013 12:40:40 +0000 (05:40 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Typo....
Add a XFAIL test for #64896
Xinchen Hui [Mon, 2 Sep 2013 08:16:07 +0000 (16:16 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Mon, 2 Sep 2013 08:15:52 +0000 (16:15 +0800)]
Typo....
Xinchen Hui [Mon, 2 Sep 2013 08:02:59 +0000 (16:02 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Mon, 2 Sep 2013 08:02:24 +0000 (16:02 +0800)]
Add a XFAIL test for #64896
Christopher Jones [Fri, 30 Aug 2013 12:40:30 +0000 (05:40 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Update NEWS
Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
Christopher Jones [Fri, 30 Aug 2013 12:40:24 +0000 (05:40 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
Remi Collet [Fri, 30 Aug 2013 08:45:33 +0000 (10:45 +0200)]
Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Remi Collet [Fri, 30 Aug 2013 08:43:12 +0000 (10:43 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Remi Collet [Fri, 30 Aug 2013 08:42:08 +0000 (10:42 +0200)]
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Xinchen Hui [Fri, 30 Aug 2013 03:22:58 +0000 (11:22 +0800)]
Update NEWS
Xinchen Hui [Fri, 30 Aug 2013 03:20:46 +0000 (11:20 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Fri, 30 Aug 2013 03:20:24 +0000 (11:20 +0800)]
Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
Christopher Jones [Thu, 29 Aug 2013 12:40:27 +0000 (05:40 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed compatibility with php-5.2
Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)
Avoid compiler warning
Fix bug #65579 (Using traits with get_class_methods causes segfault).
Christopher Jones [Thu, 29 Aug 2013 12:40:23 +0000 (05:40 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Avoid compiler warning
Fix bug #65579 (Using traits with get_class_methods causes segfault).
Dmitry Stogov [Thu, 29 Aug 2013 07:56:01 +0000 (11:56 +0400)]
Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
Dmitry Stogov [Thu, 29 Aug 2013 07:19:02 +0000 (11:19 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Conflicts:
NEWS
Dmitry Stogov [Thu, 29 Aug 2013 07:16:56 +0000 (11:16 +0400)]
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Dmitry Stogov [Thu, 29 Aug 2013 07:12:06 +0000 (11:12 +0400)]
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Dmitry Stogov [Thu, 29 Aug 2013 06:44:07 +0000 (10:44 +0400)]
Fixed compatibility with php-5.2
Dmitry Stogov [Thu, 29 Aug 2013 06:32:21 +0000 (10:32 +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:
Avoid compiler warning
Fix bug #65579 (Using traits with get_class_methods causes segfault).
Dmitry Stogov [Thu, 29 Aug 2013 06:29:48 +0000 (10:29 +0400)]
Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)
Xinchen Hui [Thu, 29 Aug 2013 06:02:34 +0000 (14:02 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 29 Aug 2013 06:02:15 +0000 (14:02 +0800)]
Avoid compiler warning
Xinchen Hui [Thu, 29 Aug 2013 06:01:54 +0000 (14:01 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Adam Harvey [Thu, 29 Aug 2013 03:33:42 +0000 (20:33 -0700)]
Fix bug #65579 (Using traits with get_class_methods causes segfault).
Specifically, this checks if there are trait aliases defined in the class scope
before attempting to dereference the first trait alias. This handles the case
where a trait alias was used in a child trait but no aliases exist in the
concrete class.
Christopher Jones [Wed, 28 Aug 2013 18:14:37 +0000 (11:14 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
removed the /Wp64 switch as we use true 64 bit compiler now
updated lib versions
updated lib versions, the vc11 ones only matter now
Christopher Jones [Wed, 28 Aug 2013 18:14:29 +0000 (11:14 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
updated lib versions
Anatol Belski [Wed, 28 Aug 2013 13:10:05 +0000 (15:10 +0200)]
removed the /Wp64 switch as we use true 64 bit compiler now
Anatol Belski [Wed, 28 Aug 2013 12:43:36 +0000 (14:43 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated lib versions
Anatol Belski [Wed, 28 Aug 2013 12:43:00 +0000 (14:43 +0200)]
updated lib versions
Anatol Belski [Wed, 28 Aug 2013 12:25:39 +0000 (14:25 +0200)]
updated lib versions, the vc11 ones only matter now
Xinchen Hui [Tue, 27 Aug 2013 07:44:30 +0000 (15:44 +0800)]
Fixed compiler warnings
warning: 'local_dval' may be used uninitialized in this function
[-Wmaybe-uninitialized]
warning: 'dval2' may be used uninitialized in this function
[-Wmaybe-uninitialized]
Dmitry Stogov [Mon, 26 Aug 2013 05:48:10 +0000 (09:48 +0400)]
Fixed compilation warning
Stanislav Malyshev [Sun, 25 Aug 2013 22:13:17 +0000 (15:13 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end
Conflicts:
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re
gron1987 [Wed, 28 Nov 2012 10:19:42 +0000 (12:19 +0200)]
Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end
Stanislav Malyshev [Sun, 25 Aug 2013 07:29:33 +0000 (00:29 -0700)]
Merge branch 'fix_travis' into PHP-5.5
* fix_travis:
fix mysql tests & mark nextRowset problematic tests
fix mysql init
add openssl
add mysql settings
Stanislav Malyshev [Sun, 25 Aug 2013 06:14:48 +0000 (23:14 -0700)]
fix mysql tests & mark nextRowset problematic tests
Stanislav Malyshev [Sun, 25 Aug 2013 06:38:54 +0000 (23:38 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix DateInterval->days value when object was created not from DateTime::diff()
Alexander Moskalev [Tue, 9 Apr 2013 20:12:39 +0000 (00:12 +0400)]
Fix DateInterval->days value when object was created not from DateTime::diff()
Stanislav Malyshev [Sun, 25 Aug 2013 04:45:14 +0000 (21:45 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Test extension xmlrpc encode type double and string decode type string and int
root [Fri, 23 Aug 2013 01:06:58 +0000 (01:06 +0000)]
Test extension xmlrpc encode type double and string decode type string and int
Stanislav Malyshev [Sun, 25 Aug 2013 04:40:52 +0000 (21:40 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Stricter libc-client symlink check
Ole Markus With [Thu, 22 Aug 2013 06:59:33 +0000 (08:59 +0200)]
Stricter libc-client symlink check
Joey Smith [Thu, 13 Sep 2012 18:37:48 +0000 (12:37 -0600)]
Expose fputcsv's escape_char to userland
Allows users to assert that something other than the backslash
should be considered an escape char; also follows the RFC 4180
recommendation that fields containing a " be enclosed.
Stanislav Malyshev [Sun, 25 Aug 2013 02:48:41 +0000 (19:48 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix #65483: quoted-printable encode stream filter incorrectly encoding spaces
Update NEWS
Michael M Slusarz [Tue, 20 Aug 2013 07:07:26 +0000 (01:07 -0600)]
Fix #65483: quoted-printable encode stream filter incorrectly encoding spaces
Stanislav Malyshev [Tue, 13 Aug 2013 16:01:17 +0000 (09:01 -0700)]
fix mysql init
Stanislav Malyshev [Tue, 13 Aug 2013 07:17:21 +0000 (00:17 -0700)]
add openssl
Stanislav Malyshev [Tue, 13 Aug 2013 05:57:06 +0000 (22:57 -0700)]
add mysql settings
Anatol Belski [Fri, 23 Aug 2013 15:41:07 +0000 (17:41 +0200)]
Suppress static analyzer warnings in specialized executor
As things like if(0) will be removed by the compiler, no need
to see that tons of warnings with static analyzer enabled.
Christopher Jones [Fri, 23 Aug 2013 15:18:33 +0000 (08:18 -0700)]
Update NEWS
Christopher Jones [Fri, 23 Aug 2013 15:13:59 +0000 (08:13 -0700)]
Update NEWS
Anatol Belski [Fri, 23 Aug 2013 14:40:28 +0000 (16:40 +0200)]
ensure the test doesn't fail because of tz warning
Nikita Popov [Fri, 23 Aug 2013 11:28:59 +0000 (13:28 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Christopher Jones [Tue, 20 Aug 2013 23:32:53 +0000 (16:32 -0700)]
Remove duplicate calls to set filename & lineno for the DTRACE_FUNCTION_ENTRY/RETURN cases
Christopher Jones [Thu, 22 Aug 2013 16:06:43 +0000 (09:06 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
Christopher Jones [Thu, 22 Aug 2013 16:05:52 +0000 (09:05 -0700)]
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
Christopher Jones [Thu, 22 Aug 2013 15:58:35 +0000 (08:58 -0700)]
Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
This reverts commit
f38bd22ed2c5f710f72e719d7ab2a41ce30541fc .
Christopher Jones [Thu, 22 Aug 2013 15:58:24 +0000 (08:58 -0700)]
Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
This reverts commit
f38bd22ed2c5f710f72e719d7ab2a41ce30541fc .
Matteo Beccati [Thu, 22 Aug 2013 13:34:11 +0000 (15:34 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed other compiler warnings
Matteo Beccati [Thu, 22 Aug 2013 13:33:12 +0000 (15:33 +0200)]
Fixed other compiler warnings
Nikita Popov [Thu, 22 Aug 2013 12:02:55 +0000 (14:02 +0200)]
Apply pgsql notice test fixes to PHP-5.5
Nikita Popov [Thu, 22 Aug 2013 09:46:51 +0000 (11:46 +0200)]
Fix intl build
Turns out that you can't use implicit void pointer casts if intl
is compiled.
Nikita Popov [Thu, 22 Aug 2013 08:56:50 +0000 (10:56 +0200)]
Fix bug #46311: Pointer aliasing issue results in miscompile on gcc4.4
The code violated the strict aliasing restriction, because it
dereferenced the same pointer as zval** once and as void**
afterwards. Now both occurances dereference void** and cast to
zval* in the former case.
Christopher Jones [Wed, 21 Aug 2013 22:43:19 +0000 (15:43 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Suppress compiler warning "warning: variable ‘length’ set but not used [-Wunused-but-set-variable]"
Suppress compiler warning "warning: variable ‘retcount’ set but not used [-Wunused-but-set-variable]"
Christopher Jones [Wed, 21 Aug 2013 22:39:14 +0000 (15:39 -0700)]
Suppress compiler warning "warning: variable ‘length’ set but not used [-Wunused-but-set-variable]"
Christopher Jones [Wed, 21 Aug 2013 22:37:02 +0000 (15:37 -0700)]
Suppress compiler warning "warning: variable ‘retcount’ set but not used [-Wunused-but-set-variable]"
Christopher Jones [Wed, 21 Aug 2013 22:23:48 +0000 (15:23 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
Christopher Jones [Wed, 21 Aug 2013 22:23:48 +0000 (15:23 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
Christopher Jones [Wed, 21 Aug 2013 22:07:03 +0000 (15:07 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
Christopher Jones [Wed, 21 Aug 2013 22:06:23 +0000 (15:06 -0700)]
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
Christopher Jones [Wed, 21 Aug 2013 17:34:09 +0000 (10:34 -0700)]
Reduce compilation noise during normal compilation:
php-5.5/ext/session/session.c:836: warning: unused variable ‘struc’
php-5.5/ext/session/session.c:836: warning: unused variable ‘num_key’
php-5.5/ext/session/session.c:836: warning: unused variable ‘key_length’
php-5.5/ext/session/session.c:836: warning: unused variable ‘key’
php-5.5/ext/session/session.c:835: warning: unused variable ‘key_type’
php-5.5/ext/session/session.c:834: warning: unused variable ‘_ht’
php-5.5/ext/session/session.c:857: warning: unused variable ‘has_value’
php-5.5/ext/session/session.c:856: warning: unused variable ‘namelen’
php-5.5/ext/session/session.c:853: warning: unused variable ‘name’
php-5.5/ext/session/session.c:852: warning: unused variable ‘p’
php-5.5/ext/session/mod_user.c:191: warning: unused variable ‘ret’
Michael Wallner [Wed, 21 Aug 2013 17:18:11 +0000 (19:18 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix pointer sign warning showing up in EVERY build
Michael Wallner [Wed, 21 Aug 2013 17:17:22 +0000 (19:17 +0200)]
Fix pointer sign warning showing up in EVERY build
Anthony Ferrara [Wed, 21 Aug 2013 16:10:40 +0000 (12:10 -0400)]
Fix return types of password API helper functions.
This fixes issues that were found during static analysis by cjones where failure was impossible to detect due to return type mangling (casting an int to a char, then comparing to an int).
Matteo Beccati [Wed, 21 Aug 2013 09:24:27 +0000 (11:24 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed compiler warnings in ext/pgsql
Fixed other compiler warnings in PDO_PGSQL
Fixed compiler warning
Matteo Beccati [Wed, 21 Aug 2013 09:21:43 +0000 (11:21 +0200)]
Fixed compiler warnings in ext/pgsql
Matteo Beccati [Wed, 21 Aug 2013 09:08:16 +0000 (11:08 +0200)]
Fixed other compiler warnings in PDO_PGSQL
Matteo Beccati [Wed, 21 Aug 2013 09:00:31 +0000 (11:00 +0200)]
Fixed compiler warning
I moved the constant to the enum in order to avoid this:
ext/pgsql/pgsql.c:3491: warning: comparison is always false due to limited range of data type
Works in gcc 4.6, but I'm not sure about other compilers.
Yasuo Ohgaki [Wed, 21 Aug 2013 02:19:06 +0000 (11:19 +0900)]
Update NEWS
Yasuo Ohgaki [Wed, 21 Aug 2013 01:51:51 +0000 (10:51 +0900)]
Add php_serialize session.serialize_handler. This patch closes
Request #25630
Request #43980
Request #54383
Bug #65359
and many others similar to these that are closed as "wont fix" or
"not a bug".
Current serializers have limitations due to register_globals support
that are no longer supported. Changing existing serializer may cause
compatibility issue. Therefore, new handler is needed to remove
needless limitations.
php_serialize does not have special characters and allow numerical
index in $_SESSION. $_SESSION can be used as ordinary array.
Yasuo Ohgaki [Wed, 21 Aug 2013 01:38:59 +0000 (10:38 +0900)]
Update NEWS
Yasuo Ohgaki [Tue, 20 Aug 2013 23:08:55 +0000 (08:08 +0900)]
Fixed Bug #65475