09ed50fa44
Remove ini dependency in test
2013-08-30 11:46:16 +09:00
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
5015c4af6c
Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
2013-08-29 11:56:01 +04:00
c8673b64ce
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compatibility with php-5.2
2013-08-29 10:45:00 +04:00
94816ed9bf
Fixed compatibility with php-5.2
2013-08-29 10:44:07 +04:00
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
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
49cd21e71c
OCI8 2.0: add oci8-check-connection probe and do some renaming
2013-08-27 16:41:02 -07:00
4b67c781f3
Use "__" consistently in OCI8 DTrace probe definitions. It maps to "-" in the probe name.
2013-08-26 15:42:57 -07:00
8aca4e45bb
Leave it to DTrace FBT to trace underlying library calls
2013-08-26 14:20:58 -07:00
a13c00cd14
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compilation warning
2013-08-26 09:49:22 +04:00
1c67a9940a
Fixed compilation warning
2013-08-26 09:48:10 +04:00
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
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
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
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
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
a2d8ae9a1f
fix mysql tests & mark nextRowset problematic tests
2013-08-24 23:56:48 -07:00
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
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
b378b0b081
Fix DateInterval->days value when object was created not from DateTime::diff()
2013-08-24 23:38:33 -07:00
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
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
e22c139fe0
Test extension xmlrpc encode type double and string decode type string and int
2013-08-24 21:44:50 -07:00
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
fa26576932
Merge branch 'pull-request/417'
...
* pull-request/417:
Stricter libc-client symlink check
2013-08-24 21:40:38 -07:00
6b8dade6dc
Stricter libc-client symlink check
2013-08-24 21:40:26 -07:00
524fab3e41
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Expose fputcsv's escape_char to userland
2013-08-24 20:46:03 -07:00
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
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
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
3f9af558e7
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
2013-08-24 19:45:54 -07:00
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
a2b1546f3b
ensure the test doesn't fail because of tz warning
2013-08-23 16:40:28 +02:00
a4de9c0397
Test extension xmlrpc encode type double and string decode type string and int
2013-08-23 01:06:58 +00:00
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
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
7109f369e8
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
2013-08-22 09:05:52 -07:00
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
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
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
80917e5ca2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed other compiler warnings
2013-08-22 15:34:22 +02:00
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
d5987478a8
Fixed other compiler warnings
2013-08-22 15:33:54 +02:00
c0d99fd76a
Apply pgsql notice test fixes to PHP-5.5
2013-08-22 14:02:55 +02:00
1a88fcc2d8
Remove trailing whitespace in test
...
Third try to make this work...
2013-08-22 13:09:53 +02:00
96045e1b33
Forgot newline in test
2013-08-22 12:26:34 +02:00
b668a26c2f
Fix pgsql notice test failure
2013-08-22 11:31:56 +02:00
e3619778c9
Stricter libc-client symlink check
2013-08-22 08:59:33 +02:00
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
Yasuo Ohgaki