Commit Graph

31224 Commits

Author SHA1 Message Date
Dmitry Stogov
1556d5df8a Fixed issue #74 (Allowed per request OPcache disabling) 2013-03-27 23:13:21 +04:00
Dmitry Stogov
91ab11ed07 Fixed issue #76 (actually we don't need zend_shared_memory_block_header at all) 2013-03-27 22:16:18 +04:00
Dmitry Stogov
fc7efecda0 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  add WebP support in phpinfo
2013-03-27 21:09:51 +04:00
Dmitry Stogov
f139534694 Added description for opcache.enable_cli 2013-03-27 21:02:39 +04:00
Pierre Joye
e7d88a63fa add WebP support in phpinfo 2013-03-27 17:38:57 +01:00
Pierre Joye
f01a7e54d3 add windows 8 and windows server 2012 2013-03-27 07:29:47 +01:00
Pierre Joye
f3ebb40ad6 FALSE on error 2013-03-27 05:13:30 +01:00
Pierre Joye
5ae6f582fb fix regression, take #2 (merge issue due to git 1.8 default setting changes) 2013-03-26 11:23:15 +01:00
Dmitry Stogov
6a7088fd18 back to dev (7.0.2-dev) 2013-03-25 13:57:50 +04:00
Dmitry Stogov
f17156c2d1 Fixed copy/paste mistake 2013-03-25 13:30:45 +04:00
Dmitry Stogov
0a00d29256 Fixed bug #64482 (Opcodes for dynamic includes should not be cached) 2013-03-25 13:05:16 +04:00
Dmitry Stogov
64b029af0d Separate "start_time" from "last_restart_time" 2013-03-25 12:33:24 +04:00
Dmitry Stogov
987dee9ca1 Fixed PHP-5.2 ZTS compatibility 2013-03-25 12:21:58 +04:00
Dmitry Stogov
a3316ffe6a 7.0.1 release 2013-03-25 11:44:09 +04:00
Stanislav Malyshev
c20e4bbc96 make it int main 2013-03-24 23:58:30 -07:00
Stanislav Malyshev
016fbd9991 fix return value 2013-03-24 23:43:25 -07:00
Stanislav Malyshev
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
Stanislav Malyshev
504ef64c7b fix typo 2013-03-24 20:03:57 -07:00
Stanislav Malyshev
7c0bdb9a4f add definition for 5.5 2013-03-24 19:54:10 -07:00
Pierre Joye
4394249881 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-03-25 03:19:08 +01:00
Pierre Joye
1b34ab8ff8 remove comments 2013-03-25 03:14:27 +01:00
Stanislav Malyshev
c342c9b964 fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs 2013-03-24 19:07:30 -07:00
Nikita Popov
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
Nikita Popov
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
Pierre Joye
be3e2bb295 fix generic rotation and 90 degrees & multiples rotation, take #2 2013-03-24 16:52:20 +01:00
Nikita Popov
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
David Soria Parra
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
Nikita Popov
aa2b54812f Fix version check in test 2013-03-24 13:58:35 +01:00
Nikita Popov
430c987716 Skip locale dependent test if locale not available 2013-03-23 21:09:21 +01:00
Nikita Popov
c2893ab592 Missed two occurances of Revision: 2013-03-23 21:09:20 +01:00
Anatol Belski
ec25e99193 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Reworked the changes for bug #64452
2013-03-23 21:00:46 +01:00
Anatol Belski
04b492a5fe Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Reworked the changes for bug #64452
2013-03-23 20:59:47 +01:00
Anatol Belski
638c4b89b7 Reworked the changes for bug #64452 2013-03-23 20:57:59 +01:00
Nikita Popov
01583bdc36 phar phpinfo uses Id instead of Revision 2013-03-23 20:11:06 +01:00
Xinchen Hui
534aec8a52 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-21 21:32:32 +08:00
Xinchen Hui
39a173b79b Fix bug in reflectionClass relate to #64239 2013-03-21 21:32:06 +08:00
Xinchen Hui
08624ea90d Fix test after f8b91d9acf 2013-03-21 15:57:21 +08:00
Xinchen Hui
b29a9fa75d Merge branch 'PHP-5.4' into PHP-5.5 2013-03-21 11:14:36 +08:00
Xinchen Hui
0fd3572f4e Fixed bug #64432 (more empty delimiter warning in strX methods) 2013-03-21 11:14:10 +08:00
Xinchen Hui
da6916a770 fix memory leak
the value shouldn't be ref, use z_add_ref is enough
2013-03-21 10:58:58 +08:00
David Soria Parra
0173c4bab0 Merge branch 'pull-request/257' into PHP-5.5
* pull-request/257:
  array_column: Fix compile-time warnings
  array_column: Removed array_pluck() alias
  array_column: Set array_pluck as an alias for array_column
  array_column: Implement ability to specify an index column
  Cleaning up a memory leak.
  array_column: Adding test for IS_OBJECT and converting object to string
  array_column: Using add_next_index_zval() at nikic's recommendation.
  array_column: Improved tests
  array_column: Cleaning up, as recommended in pull request #56 comments
  Fixing typo in test for array_column()
  Simplify the code and use zend_hash_next_index_insert()
  Adding test for columns not present in all rows for array_column().
  Adding tests for the negative results of array_column()
  Implement new array function array_column()
2013-03-20 13:02:33 +01:00
Pierre Joye
1ec484d3c5 - add imageaffinematrixget and imagematrixconcat 2013-03-20 12:19:03 +01:00
Pierre Joye
780c6e0a9c - add affine matrix helper for translate, scale, rotate and shear 2013-03-20 11:01:37 +01:00
Pierre Joye
a46065ef71 - fix unix build 2013-03-20 09:24:54 +01:00
Anatol Belski
0125ec77d2 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated NEWS
  Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:14:13 +01:00
Anatol Belski
06a526be3e Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:12:33 +01:00
Anatol Belski
bb935ff8dc Fixed bug #64452 Zip PHPTs crash intermittently 2013-03-20 09:10:10 +01:00
Pierre Joye
a7a53d369b - add new files for interpolation 2013-03-20 08:10:54 +01:00
Pierre Joye
00a53ca817 - config.m4 sync with .w32 2013-03-20 07:52:23 +01:00
Pierre Joye
22159fb7b7 - 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-20 07:46:59 +01:00