49cd21e71c
OCI8 2.0: add oci8-check-connection probe and do some renaming
2013-08-27 16:41:02 -07:00
72f80b2997
Merge branch 'PHP-5.5'
2013-08-27 15:45:27 +08:00
0119bbba6b
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]
2013-08-27 15:44:30 +08:00
4b67c781f3
Use "__" consistently in OCI8 DTrace probe definitions. It maps to "-" in the probe name.
2013-08-26 15:42:57 -07:00
493ad87027
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
2013-08-26 14:36:22 -07:00
8aca4e45bb
Leave it to DTrace FBT to trace underlying library calls
2013-08-26 14:20:58 -07:00
d18b969858
Evaluate ZVAL_ZVAL arguments only once
...
Also remove some isref/refcount assignments, which are no longer
necessary (as ZVAL_COPY_VALUE is used now).
2013-08-26 19:57:14 +02: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
a84bb6bf86
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix DateInterval->days value when object was created not from DateTime::diff()
2013-08-24 23:39:13 -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
cbc848a555
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Test extension xmlrpc encode type double and string decode type string and int
2013-08-24 21:45:26 -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
603098d73d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Stricter libc-client symlink check
2013-08-24 21:41:03 -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
3e4f862076
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
Update NEWS
2013-08-24 19:50:11 -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
817eebc733
fix mysql init
2013-08-24 19:39:00 -07:00
f57a722c85
add openssl
2013-08-24 19:38:46 -07:00
f31d6bc0d9
add mysql settings
2013-08-24 19:38:30 -07:00
07fa043cc3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Suppress static analyzer warnings in specialized executor
Update NEWS
2013-08-23 17:45:45 +02:00
716fc80fda
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.
2013-08-23 17:41:07 +02:00
38f9c515cd
Update NEWS
2013-08-23 08:18:33 -07:00
768c34e7cd
Update NEWS
2013-08-23 08:13:59 -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
c0856a178f
Merge branch 'PHP-5.5'
2013-08-23 13:30:46 +02:00
686402a865
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-23 13:28:59 +02:00
5ab6d215fc
Remove duplicate calls to set filename & lineno for the DTRACE_FUNCTION_ENTRY/RETURN cases
2013-08-23 13:27:42 +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
Christopher Jones