d40174c6bb
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added description for opcache.enable_cli
2013-03-27 21:04:04 +04:00
f139534694
Added description for opcache.enable_cli
2013-03-27 21:02:39 +04:00
b03810761e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add windows 8 and windows server 2012
2013-03-27 07:29:56 +01:00
f01a7e54d3
add windows 8 and windows server 2012
2013-03-27 07:29:47 +01:00
705ab20252
Merge branch 'PHP-5.5'
...
* PHP-5.5:
FALSE on error
2013-03-27 05:13:42 +01:00
f3ebb40ad6
FALSE on error
2013-03-27 05:13:30 +01:00
8a85da4a61
merging conflict left over
2013-03-26 17:46:29 +01:00
111123af4f
conflict
2013-03-26 11:24:00 +01:00
5ae6f582fb
fix regression, take #2 (merge issue due to git 1.8 default setting changes)
2013-03-26 11:23:15 +01:00
d74a192bd4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
back to dev (7.0.2-dev)
2013-03-25 13:58:12 +04:00
6a7088fd18
back to dev (7.0.2-dev)
2013-03-25 13:57:50 +04:00
57a0c655aa
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed copy/paste mistake
2013-03-25 13:31:19 +04:00
f17156c2d1
Fixed copy/paste mistake
2013-03-25 13:30:45 +04:00
dedd0f56b6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64482 (Opcodes for dynamic includes should not be cached)
Separate "start_time" from "last_restart_time"
Fixed PHP-5.2 ZTS compatibility
2013-03-25 13:06:10 +04:00
0a00d29256
Fixed bug #64482 (Opcodes for dynamic includes should not be cached)
2013-03-25 13:05:16 +04:00
64b029af0d
Separate "start_time" from "last_restart_time"
2013-03-25 12:33:24 +04:00
987dee9ca1
Fixed PHP-5.2 ZTS compatibility
2013-03-25 12:21:58 +04:00
2c22ffc909
Merge branch 'PHP-5.5'
...
* PHP-5.5:
7.0.1 release
2013-03-25 11:45:12 +04:00
a3316ffe6a
7.0.1 release
2013-03-25 11:44:09 +04:00
4003cc23b1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
make it int main
2013-03-24 23:58:50 -07:00
c20e4bbc96
make it int main
2013-03-24 23:58:30 -07:00
981cd9c500
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix return value
2013-03-24 23:43:45 -07:00
016fbd9991
fix return value
2013-03-24 23:43:25 -07:00
9e86fa301f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add code to check if we know flock definition on this system
2013-03-24 20:12:33 -07:00
385d0e52cc
add code to check if we know flock definition on this system
...
In order to configure detect it and not fail the compile.
Not an ideal solution, suggestions are welcome on how to improve it.
2013-03-24 20:11:28 -07:00
c1ac5a20a5
fix typo
2013-03-24 20:04:24 -07:00
bf457a0387
add definition for 5.5
2013-03-24 20:04:24 -07:00
504ef64c7b
fix typo
2013-03-24 20:03:57 -07:00
7c0bdb9a4f
add definition for 5.5
2013-03-24 19:54:10 -07:00
4394249881
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-03-25 03:19:08 +01:00
52b4a251b7
Merge branch 'master' of git.php.net:php-src
2013-03-25 03:17:59 +01:00
f21f37bb4c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
remove comments
2013-03-25 03:14:40 +01:00
1b34ab8ff8
remove comments
2013-03-25 03:14:27 +01:00
c342c9b964
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
2013-03-24 19:07:30 -07:00
be278293e4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
2013-03-24 19:04:43 -07:00
bd0b09c610
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
2013-03-24 19:03:04 -07:00
1e8423b041
Merge branch 'PHP-5.5'
2013-03-24 17:55:01 +01:00
c08e1d2be9
Fix PDO::inTransaction() test for pgsql
...
inTransaction() nowadays casts the in_transaction result to boolean.
I'm not sure whether the INERROR state should result in true or false.
For now I went with the result that we actually get.
2013-03-24 17:54:05 +01:00
095d552589
Merge branch 'PHP-5.5'
2013-03-24 17:07:36 +01:00
4633e07e29
Fix mysql_list_fields.phpt test
...
The minimum length is given in bytes, so it is charset dependent.
For utf8 charsets for example it's 3 rather than 1.
2013-03-24 17:07:16 +01:00
94c083ba64
fix conflict
2013-03-24 16:54:55 +01:00
be3e2bb295
fix generic rotation and 90 degrees & multiples rotation, take #2
2013-03-24 16:52:20 +01:00
453bcfecbf
Merge branch 'PHP-5.5'
2013-03-24 16:09:59 +01:00
585f71f497
Fix some errors in mysqlnd charset list
...
I fixed the stuff that seemed obviously wrong, but there are some more
differences with the SHOW COLLATIONS output:
* The whole range of "utf16" collations missing
* "filename" missing
* "ucs2_general_mysql500_ci" and "utf8_general_mysql500_ci" missing
I wasn't sure whether those omissions are intentional, so I didn't add
them.
2013-03-24 16:09:39 +01:00
ec7250fb64
Merge commit '1ec484d' into PHP-5.5
...
* commit '1ec484d':
- add imageaffinematrixget and imagematrixconcat
- add affine matrix helper for translate, scale, rotate and shear
- fix unix build
- add new files for interpolation
- config.m4 sync with .w32
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-24 14:05:55 +01:00
fce19c5f57
Merge branch 'PHP-5.5'
2013-03-24 13:58:44 +01:00
aa2b54812f
Fix version check in test
2013-03-24 13:58:35 +01:00
03c55d6971
Merge branch 'PHP-5.5'
2013-03-23 21:09:37 +01:00
430c987716
Skip locale dependent test if locale not available
2013-03-23 21:09:21 +01:00
c2893ab592
Missed two occurances of Revision:
2013-03-23 21:09:20 +01:00
Dmitry Stogov