unknown
d32194172a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
ensure that the defined interpolation method is used by the generic scaling functions
2013-09-09 11:56:58 +02:00
unknown
b54b6e30a4
ensure that the defined interpolation method is used by the generic scaling functions
2013-09-09 11:56:05 +02:00
Dmitry Stogov
df711f2c56
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #128 (opcache_invalidate segmentation fault)
2013-09-09 10:11:43 +04:00
Dmitry Stogov
8d860c1218
Fixed issue #128 (opcache_invalidate segmentation fault)
2013-09-09 10:05:59 +04:00
Christopher Jones
43289d664c
Remove obsolete flag
2013-09-06 10:12:16 -07:00
Christopher Jones
ca4d122adc
Update DTrace probes
2013-09-06 08:54:19 -07:00
Christopher Jones
e504ed66a8
Add test for oci_set_* error changes
2013-09-06 08:14:18 -07:00
Christopher Jones
4b778faa80
Make oci_set_*($connection,...) errors retrievable via oci_error($connection).
...
Improve some error handling to produce error text on some rare edge cases.
Disambiguate the Oracle library function call return status values from ORA error numbers.
Review and unify error data types.
2013-09-05 18:18:29 -07:00
Christopher Jones
6ece550394
Cast time_t since some "dtrace -G" invocations fail on time_t arguments
2013-09-03 15:17:36 -07:00
Nikita Popov
47ee470992
Make use of direct returns in some places
2013-08-31 13:16:50 +02:00
Christopher Jones
d7ffca590b
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.
2013-08-30 17:37:44 -07:00
Christopher Jones
82da51bbce
OCI8: remove unused ext/oci8/config.m4 macro
2013-08-30 11:15:56 -07:00
Christopher Jones
e6053acd78
OCI8 whitespace: remove tabs embedded in code
2013-08-30 11:14:20 -07:00
Remi Collet
9e17094cf4
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
2013-08-30 10:46:06 +02:00
Remi Collet
6fab1caa41
Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
2013-08-30 10:45:33 +02:00
Remi Collet
a5749eb0cb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
2013-08-30 10:43:12 +02:00
Remi Collet
d69513afec
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
2013-08-30 10:42:08 +02:00
Yasuo Ohgaki
09ed50fa44
Remove ini dependency in test
2013-08-30 11:46:16 +09:00
Dmitry Stogov
ec173433da
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
Conflicts:
NEWS
2013-08-29 11:57:19 +04:00
Dmitry Stogov
5015c4af6c
Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
2013-08-29 11:56:01 +04:00
Dmitry Stogov
c8673b64ce
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compatibility with php-5.2
2013-08-29 10:45:00 +04:00
Dmitry Stogov
94816ed9bf
Fixed compatibility with php-5.2
2013-08-29 10:44:07 +04:00
Dmitry Stogov
b6864d978c
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
2013-08-29 10:31:14 +04:00
Dmitry Stogov
790db9ff9b
Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)
2013-08-29 10:29:48 +04:00
Christopher Jones
49cd21e71c
OCI8 2.0: add oci8-check-connection probe and do some renaming
2013-08-27 16:41:02 -07:00
Michael Wallner
d4b673a34c
fix ZTS build
2013-08-27 14:01:59 +02:00
Michael Wallner
bb1f9d3826
slim post data
2013-08-27 13:43:22 +02:00
Michael Wallner
2438490add
slim post data
2013-08-27 13:31:35 +02:00
Christopher Jones
4b67c781f3
Use "__" consistently in OCI8 DTrace probe definitions. It maps to "-" in the probe name.
2013-08-26 15:42:57 -07:00
Christopher Jones
8aca4e45bb
Leave it to DTrace FBT to trace underlying library calls
2013-08-26 14:20:58 -07:00
Dmitry Stogov
a13c00cd14
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compilation warning
2013-08-26 09:49:22 +04:00
Dmitry Stogov
1c67a9940a
Fixed compilation warning
2013-08-26 09:48:10 +04:00
Stanislav Malyshev
7c08ce243c
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
2013-08-25 15:14:36 -07:00
Stanislav Malyshev
825a505494
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
2013-08-25 15:14:17 -07:00
gron1987
e6424d89e9
Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end
2013-08-25 15:09:29 -07:00
Stanislav Malyshev
60854d1d26
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix mysql tests & mark nextRowset problematic tests
fix mysql init
add openssl
add mysql settings
2013-08-25 00:30:00 -07:00
Stanislav Malyshev
e045cbaa14
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
2013-08-25 00:29:33 -07:00
Stanislav Malyshev
a2d8ae9a1f
fix mysql tests & mark nextRowset problematic tests
2013-08-24 23:56:48 -07:00
Stanislav Malyshev
01c028a475
Merge branch 'pull-request/322'
...
* pull-request/322:
Remove semicolon
Fix DateInterval->days value when object was created not from DateTime::diff()
2013-08-24 23:39:09 -07:00
Stanislav Malyshev
c0bfccafd2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix DateInterval->days value when object was created not from DateTime::diff()
2013-08-24 23:38:54 -07:00
Alexander Moskalev
b378b0b081
Fix DateInterval->days value when object was created not from DateTime::diff()
2013-08-24 23:38:33 -07:00
Stanislav Malyshev
26cd3425ee
Merge branch 'pull-request/419'
...
* pull-request/419:
Test extension xmlrpc encode type double and string decode type string and int
2013-08-24 21:45:21 -07:00
Stanislav Malyshev
a89e71397d
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
2013-08-24 21:45:14 -07:00
root
e22c139fe0
Test extension xmlrpc encode type double and string decode type string and int
2013-08-24 21:44:50 -07:00
Stanislav Malyshev
286c745d81
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Stricter libc-client symlink check
2013-08-24 21:40:52 -07:00
Stanislav Malyshev
fa26576932
Merge branch 'pull-request/417'
...
* pull-request/417:
Stricter libc-client symlink check
2013-08-24 21:40:38 -07:00
Ole Markus With
6b8dade6dc
Stricter libc-client symlink check
2013-08-24 21:40:26 -07:00
Stanislav Malyshev
524fab3e41
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Expose fputcsv's escape_char to userland
2013-08-24 20:46:03 -07:00
Joey Smith
2139d2702d
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.
2013-08-24 20:45:14 -07:00
Stanislav Malyshev
8ee126f0bb
Merge branch 'pull-request/414'
...
* pull-request/414:
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
2013-08-24 19:49:59 -07:00
Stanislav Malyshev
bdccf0a61d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
Update NEWS
2013-08-24 19:49:27 -07:00
Michael M Slusarz
3f9af558e7
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
2013-08-24 19:45:54 -07:00
Anatol Belski
77303a3248
Merge branch 'PHP-5.5'
...
* PHP-5.5:
ensure the test doesn't fail because of tz warning
2013-08-23 16:41:02 +02:00
Anatol Belski
a2b1546f3b
ensure the test doesn't fail because of tz warning
2013-08-23 16:40:28 +02:00
root
a4de9c0397
Test extension xmlrpc encode type double and string decode type string and int
2013-08-23 01:06:58 +00:00
Christopher Jones
27954a8b8a
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""
2013-08-22 09:07:07 -07:00
Christopher Jones
c1ecdfbf6e
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""
2013-08-22 09:06:43 -07:00
Christopher Jones
7109f369e8
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
2013-08-22 09:05:52 -07:00
Christopher Jones
18282f42c5
Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
...
This reverts commit f38bd22ed2
.
2013-08-22 08:58:35 -07:00
Christopher Jones
f2ceb4963e
Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
...
This reverts commit f38bd22ed2
.
2013-08-22 08:58:24 -07:00
Christopher Jones
a61f5bf925
Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
...
This reverts commit f38bd22ed2
.
2013-08-22 08:57:18 -07:00
Matteo Beccati
80917e5ca2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed other compiler warnings
2013-08-22 15:34:22 +02:00
Matteo Beccati
908da14bd1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed other compiler warnings
2013-08-22 15:34:11 +02:00
Matteo Beccati
d5987478a8
Fixed other compiler warnings
2013-08-22 15:33:54 +02:00
Nikita Popov
c0d99fd76a
Apply pgsql notice test fixes to PHP-5.5
2013-08-22 14:02:55 +02:00
Nikita Popov
1a88fcc2d8
Remove trailing whitespace in test
...
Third try to make this work...
2013-08-22 13:09:53 +02:00
Nikita Popov
96045e1b33
Forgot newline in test
2013-08-22 12:26:34 +02:00
Nikita Popov
b668a26c2f
Fix pgsql notice test failure
2013-08-22 11:31:56 +02:00
Ole Markus With
e3619778c9
Stricter libc-client symlink check
2013-08-22 08:59:33 +02:00
Christopher Jones
9507fcfdc5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
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]"
2013-08-21 15:43:33 -07:00
Christopher Jones
11087eece7
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]"
2013-08-21 15:43:19 -07:00
Christopher Jones
54d4a28003
Suppress compiler warning "warning: variable ‘length’ set but not used [-Wunused-but-set-variable]"
2013-08-21 15:39:14 -07:00
Christopher Jones
1af111dd68
Suppress compiler warning "warning: variable ‘retcount’ set but not used [-Wunused-but-set-variable]"
2013-08-21 15:37:02 -07:00
Christopher Jones
71ba571e53
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
2013-08-21 15:07:13 -07:00
Christopher Jones
9895e8bbe6
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"
2013-08-21 15:07:03 -07:00
Christopher Jones
f38bd22ed2
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
2013-08-21 15:06:23 -07:00
Christopher Jones
d9bfe06194
Merge branch 'PHP-5.5'
...
* PHP-5.5:
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’
2013-08-21 10:35:07 -07:00
Christopher Jones
d85827fb7f
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’
2013-08-21 10:34:09 -07:00
Michael Wallner
4abee3730f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix pointer sign warning showing up in EVERY build
2013-08-21 19:18:29 +02:00
Michael Wallner
6181948592
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix pointer sign warning showing up in EVERY build
2013-08-21 19:18:11 +02:00
Michael Wallner
d8023d13eb
Fix pointer sign warning showing up in EVERY build
2013-08-21 19:17:22 +02:00
Anthony Ferrara
90b489f826
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix return types of password API helper functions.
2013-08-21 12:11:10 -04:00
Anthony Ferrara
83e3466898
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).
2013-08-21 12:10:40 -04:00
Matteo Beccati
3ec28b1d1f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compiler warnings in ext/pgsql
Fixed other compiler warnings in PDO_PGSQL
Fixed compiler warning
Update NEWS
Conflicts:
ext/pdo_pgsql/pgsql_driver.c
2013-08-21 11:26:41 +02:00
Matteo Beccati
4283f75c34
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
2013-08-21 11:24:27 +02:00
Matteo Beccati
540f325664
Fixed compiler warnings in ext/pgsql
2013-08-21 11:24:12 +02:00
Matteo Beccati
696852f2bd
Fixed other compiler warnings in PDO_PGSQL
2013-08-21 11:22:33 +02:00
Matteo Beccati
5c06e5c2e0
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.
2013-08-21 11:22:32 +02:00
Yasuo Ohgaki
aaf95aa1b6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add php_serialize session.serialize_handler. This patch closes
2013-08-21 11:06:11 +09:00
Yasuo Ohgaki
c51f77fe83
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.
2013-08-21 10:51:51 +09:00
Yasuo Ohgaki
d2a99a7c31
Fixed Bug #65475
2013-08-21 08:12:11 +09:00
Yasuo Ohgaki
1641158644
Fixed Bug #65475
2013-08-21 08:11:59 +09:00
Christopher Jones
89c4abab2b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Quash compile warning "warning: 'flags' may be used uninitialized in this function"
2013-08-20 13:37:22 -07:00
Christopher Jones
268c2884fa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Quash compile warning "warning: 'flags' may be used uninitialized in this function"
2013-08-20 13:37:02 -07:00
Christopher Jones
e9b12bedc3
Quash compile warning "warning: 'flags' may be used uninitialized in this function"
2013-08-20 13:36:18 -07:00
Christopher Jones
92b946bb9e
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
Fix bug #64953 (Postgres prepared statement positional parameter casting)
2013-08-20 11:27:01 -07:00
Christopher Jones
9e1e0096d1
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 :
Fix bug #64953 (Postgres prepared statement positional parameter casting)
2013-08-20 11:26:57 -07:00
Christopher Jones
9c9fee3f43
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 :
Fix bug #64953 (Postgres prepared statement positional parameter casting)
2013-08-20 11:26:49 -07:00
Christopher Jones
77f5caae53
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove compilation warning "warning: no newline at end of file"
2013-08-20 11:04:51 -07:00
Christopher Jones
433225a929
Remove compilation warning "warning: no newline at end of file"
2013-08-20 11:04:26 -07:00