]>
granicus.if.org Git - php/log
Nikita Popov [Mon, 26 Aug 2013 17:06:36 +0000 (19:06 +0200)]
Always pass return_value_ptr to internal functions
Previous some places passed return_value_ptr only if the function
returned by reference. Now return_value_ptr is always set, even
for functions returning by-value.
This allows you to return zvals without copying their contents. For
this purpose two new macros RETVAL_ZVAL_FAST and RETURN_ZVAL_FAST
are added:
RETVAL_ZVAL_FAST(zv); /* Analog to RETVAL_ZVAL(zv, 1, 0) */
RETURN_ZVAL_FAST(zv); /* Analog to RETURN_ZVAL(zv, 1, 0) */
These macros behave similarly to the non-FAST versions with
copy=1 and dtor=0, with the difference that the FAST versions
will try return the zval without copying by utilizing return_value_ptr.
Christopher Jones [Sat, 31 Aug 2013 00:37:44 +0000 (17:37 -0700)]
Allow OCI8 to be DTrace-enabled independently of core PHP's DTrace
status. The proviso is OCI8 must be built "shared" when DTrace is
enabled. This implementation (i) works around an incomplete core PHP
solution for extension tracing (ii) avoid any issues with DOF section
location and the complexities of needing to merge all provider .d
files for static builds (iii) allows OCI8 to be DTrace-enabled when
doing PECL installs of OCI8 on PHP versions without core PHP DTrace
support.
This is an initial patch i.e. it will undergo further testing.
Christopher Jones [Fri, 30 Aug 2013 18:15:56 +0000 (11:15 -0700)]
OCI8: remove unused ext/oci8/config.m4 macro
Christopher Jones [Fri, 30 Aug 2013 18:14:20 +0000 (11:14 -0700)]
OCI8 whitespace: remove tabs embedded in code
Christopher Jones [Fri, 30 Aug 2013 12:40:44 +0000 (05:40 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' 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)
Remove ini dependency in test
Remi Collet [Fri, 30 Aug 2013 08:46:06 +0000 (10:46 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
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:23:24 +0000 (11:23 +0800)]
Merge branch 'PHP-5.5'
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)
Yasuo Ohgaki [Fri, 30 Aug 2013 02:46:16 +0000 (11:46 +0900)]
Remove ini dependency in test
Christopher Jones [Thu, 29 Aug 2013 12:40:31 +0000 (05:40 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' 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).
Dmitry Stogov [Thu, 29 Aug 2013 07:57:19 +0000 (11:57 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
Conflicts:
NEWS
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:20:12 +0000 (11:20 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
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: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:45:00 +0000 (10:45 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed compatibility with php-5.2
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:31:50 +0000 (10:31 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' 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:31:14 +0000 (10:31 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)
Conflicts:
NEWS
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:53 +0000 (14:02 +0800)]
Merge branch 'PHP-5.5'
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:51 +0000 (11:14 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' 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
Anatol Belski [Wed, 28 Aug 2013 13:10:42 +0000 (15:10 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
removed the /Wp64 switch as we use true 64 bit compiler now
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:53 +0000 (14:43 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
updated lib versions
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:30:03 +0000 (14:30 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
updated lib versions, the vc11 ones only matter now
Anatol Belski [Wed, 28 Aug 2013 12:25:39 +0000 (14:25 +0200)]
updated lib versions, the vc11 ones only matter now
Christopher Jones [Tue, 27 Aug 2013 23:41:02 +0000 (16:41 -0700)]
OCI8 2.0: add oci8-check-connection probe and do some renaming
Xinchen Hui [Tue, 27 Aug 2013 07:45:27 +0000 (15:45 +0800)]
Merge branch 'PHP-5.5'
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]
Christopher Jones [Mon, 26 Aug 2013 22:42:57 +0000 (15:42 -0700)]
Use "__" consistently in OCI8 DTrace probe definitions. It maps to "-" in the probe name.
Christopher Jones [Mon, 26 Aug 2013 21:36:22 +0000 (14:36 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
Evaluate ZVAL_ZVAL arguments only once
Christopher Jones [Mon, 26 Aug 2013 21:20:58 +0000 (14:20 -0700)]
Leave it to DTrace FBT to trace underlying library calls
Nikita Popov [Mon, 26 Aug 2013 17:57:14 +0000 (19:57 +0200)]
Evaluate ZVAL_ZVAL arguments only once
Also remove some isref/refcount assignments, which are no longer
necessary (as ZVAL_COPY_VALUE is used now).
Dmitry Stogov [Mon, 26 Aug 2013 05:49:22 +0000 (09:49 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed compilation warning
Dmitry Stogov [Mon, 26 Aug 2013 05:48:10 +0000 (09:48 +0400)]
Fixed compilation warning
Stanislav Malyshev [Sun, 25 Aug 2013 22:14:36 +0000 (15:14 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
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 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:30:00 +0000 (00:30 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix mysql tests & mark nextRowset problematic tests
fix mysql init
add openssl
add mysql settings
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:39:13 +0000 (23:39 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix DateInterval->days value when object was created not from DateTime::diff()
Stanislav Malyshev [Sun, 25 Aug 2013 06:39:09 +0000 (23:39 -0700)]
Merge branch 'pull-request/322'
* pull-request/322:
Remove semicolon
Fix DateInterval->days value when object was created not from DateTime::diff()
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:26 +0000 (21:45 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Test extension xmlrpc encode type double and string decode type string and int
Stanislav Malyshev [Sun, 25 Aug 2013 04:45:21 +0000 (21:45 -0700)]
Merge branch 'pull-request/419'
* pull-request/419:
Test extension xmlrpc encode type double and string decode type string and int
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:41:03 +0000 (21:41 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Stricter libc-client symlink check
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
Stanislav Malyshev [Sun, 25 Aug 2013 04:40:38 +0000 (21:40 -0700)]
Merge branch 'pull-request/417'
* pull-request/417:
Stricter libc-client symlink check
Ole Markus With [Thu, 22 Aug 2013 06:59:33 +0000 (08:59 +0200)]
Stricter libc-client symlink check
Stanislav Malyshev [Sun, 25 Aug 2013 03:46:03 +0000 (20:46 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Expose fputcsv's escape_char to userland
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:50:11 +0000 (19:50 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix #65483: quoted-printable encode stream filter incorrectly encoding spaces
Update NEWS
Stanislav Malyshev [Sun, 25 Aug 2013 02:49:59 +0000 (19:49 -0700)]
Merge branch 'pull-request/414'
* pull-request/414:
Fix #65483: quoted-printable encode stream filter incorrectly encoding spaces
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:45:45 +0000 (17:45 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Suppress static analyzer warnings in specialized executor
Update NEWS
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:41:02 +0000 (16:41 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
ensure the test doesn't fail because of tz warning
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:30:46 +0000 (13:30 +0200)]
Merge branch 'PHP-5.5'
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
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
Christopher Jones [Thu, 22 Aug 2013 16:07:07 +0000 (09:07 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
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""
Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
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 .
Christopher Jones [Thu, 22 Aug 2013 15:57:18 +0000 (08:57 -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:22 +0000 (15:34 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed other compiler warnings
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:07:32 +0000 (14:07 +0200)]
Merge branch 'PHP-5.5'
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 11:08:47 +0000 (13:08 +0200)]
Remove trailing whitespace in test
Third try to make this work...
Nikita Popov [Thu, 22 Aug 2013 10:26:34 +0000 (12:26 +0200)]
Forgot newline in test
Nikita Popov [Thu, 22 Aug 2013 09:47:55 +0000 (11:47 +0200)]
Merge branch 'PHP-5.5'