Commit Graph

74843 Commits

Author SHA1 Message Date
Dmitry Stogov
eb22041ffe Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris) 2013-10-28 14:19:40 +04:00
Dmitry Stogov
1dcca1fdb9 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  increase backlog to the highest value everywhere
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters

Conflicts:
	NEWS
2013-10-28 13:50:04 +04:00
Antony Dovgal
a9c288ed3c 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:
  Improved performance of func_get_args() by eliminating useless copying
  Link to more readmes
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-28 13:47:13 +04:00
Yasuo Ohgaki
0db6adda48 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  Improved performance of func_get_args() by eliminating useless copying
  Link to more readmes
2013-10-28 18:38:22 +09:00
Dmitry Stogov
5c0890ba8a Improved performance of array_merge() by eliminating useless copying 2013-10-28 13:31:44 +04:00
Dmitry Stogov
91b8a6752e Improved performance of func_get_args() by eliminating useless copying 2013-10-28 13:17:55 +04:00
Hannes Magnusson
f8f643b4f7 Link to more readmes 2013-10-27 16:40:37 -07:00
Antony Dovgal
9765763413 increase backlog to the highest value everywhere
It makes no sense to use -1 for *BSD (which is the highest value there)
and still use 128 for Linux.
Lets raise it right to up the limit and let the people lower it if they
think that 3.5Mb is too much for a process.
IMO this is better than silently dropping connections.
2013-10-27 22:54:47 +04:00
Yasuo Ohgaki
66fe7fabad Update NEWS 2013-10-26 10:42:55 +09:00
Yasuo Ohgaki
bd1d2d8fb0 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-26 10:42:18 +09:00
Yasuo Ohgaki
a209cf7a5a Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  Increment version number, since this will be 5.5.6.
2013-10-26 10:41:53 +09:00
Yasuo Ohgaki
e50eb1ce34 Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters 2013-10-26 10:31:21 +09:00
Adam Harvey
70c3a722e2 Increment version number, since this will be 5.5.6. 2013-10-23 12:36:27 -07:00
Xinchen Hui
0adba0abb9 Added Zend Debugger to the note about the load order (by trash4you at online dot de) 2013-10-23 19:26:24 +08:00
Yasuo Ohgaki
6af3683a4c Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix Coverity issue reporting wrong sizeof()
2013-10-22 12:29:01 +09:00
Yasuo Ohgaki
6410f6ff68 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src: (178 commits)
  Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
  exif NEWS
  add tests for bug #62523
  Merged PR #293 (Exif crash on unknown encoding was fixed) By: 	Draal Conflicts: 	configure.in 	main/php_version.h
  fix bug #65936 (dangling context pointer causes crash)
  remove TRAVIS check in test source
  Fixed compilation warning
  Just SKIP that test on travis
  Fixed issue #115 (path issue when using phar).
  fix memory leak on error (from Coverity scan)
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
  fix argument type & remove warning
  fix const warnings in intl methods
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  fix possibility of access to *storedType without initialization
  5.4.21 release date
  Fix typo
  These getpwnam('') tests are silly and not portable
  ...
2013-10-22 12:27:47 +09:00
Yasuo Ohgaki
1f5b1cfb2b Fix Coverity issue reporting wrong sizeof() 2013-10-22 12:27:18 +09:00
Yasuo Ohgaki
2cf5614f5f Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src: (101 commits)
  exif NEWS
  add tests for bug #62523
  Merged PR #293 (Exif crash on unknown encoding was fixed) By: 	Draal Conflicts: 	configure.in 	main/php_version.h
  Just SKIP that test on travis
  fix memory leak on error (from Coverity scan)
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
  Fix typo
  Clean up this weird safe_emalloc() call
  Minor Coverity tweaks
  - Moved NULL check before dereferencing
  - Fixed possible NULL ptr dereference
  - Fixed possible uninitialized scalar variable usage (spotted by Coverity)
  Remove senseless check here
  - Fix extern declaration according to definition
  - Fix possible memory leak
  - Moved allocation to if block to make Coverity happy
  - Fixed possible memory leak
  Fix unitialized opened_path here - found by Coverity
  ...
2013-10-22 12:23:07 +09:00
Christopher Jones
b6ceea4a25 Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org) 2013-10-21 14:20:35 -07:00
Michael Wallner
ee7cfa022d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  exif NEWS
2013-10-21 22:44:53 +02:00
Michael Wallner
5cc797d119 exif NEWS 2013-10-21 22:44:37 +02:00
Michael Wallner
757f4a952c Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add tests for bug #62523
  Merged PR #293 (Exif crash on unknown encoding was fixed) By: 	Draal Conflicts: 	configure.in 	main/php_version.h
2013-10-21 22:15:55 +02:00
Michael Wallner
2fa5f39e4c add tests for bug #62523 2013-10-21 22:15:09 +02:00
Michael Wallner
1b43f95040 Merged PR #293 (Exif crash on unknown encoding was fixed)
By:
	Draal
Conflicts:
	configure.in
	main/php_version.h
2013-10-21 21:48:27 +02:00
Antony Dovgal
b636c03426 fix bug #65936 (dangling context pointer causes crash)
reported by Leon Sorokin
2013-10-21 15:09:29 +04:00
Michael Wallner
e78c53680f Merge remote-tracking branch 'refs/remotes/origin/PHP-5.5' into PHP-5.5
* refs/remotes/origin/PHP-5.5:
  Fixed compilation warning
2013-10-21 12:23:01 +02:00
Michael Wallner
fb610b4e80 remove TRAVIS check in test source 2013-10-21 12:18:58 +02:00
Michael Wallner
825174e480 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Just SKIP that test on travis
2013-10-21 12:18:10 +02:00
Dmitry Stogov
60ce3811ae Fixed compilation warning 2013-10-21 14:17:10 +04:00
Michael Wallner
2ecf94e07e Just SKIP that test on travis 2013-10-21 12:16:41 +02:00
Xinchen Hui
098855433d Fixed issue #115 (path issue when using phar). 2013-10-21 17:40:39 +08:00
Stanislav Malyshev
cb47396d46 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix memory leak on error (from Coverity scan)
2013-10-21 00:02:21 -07:00
Stanislav Malyshev
f860486de5 fix memory leak on error (from Coverity scan) 2013-10-21 00:01:24 -07:00
Stanislav Malyshev
00697927d8 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
2013-10-20 23:04:26 -07:00
Stanislav Malyshev
297324146e Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag 2013-10-20 23:04:16 -07:00
Stanislav Malyshev
27ebcb8d0e 5.4.21 release date 2013-10-20 23:04:16 -07:00
Stanislav Malyshev
8f19a8da65 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
2013-10-20 23:04:03 -07:00
Stanislav Malyshev
8bef8e66cf fix argument type & remove warning 2013-10-20 22:59:07 -07:00
Stanislav Malyshev
ef9069b4ef fix const warnings in intl methods 2013-10-20 22:32:20 -07:00
Rasmus Lerdorf
910d4751e3 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
2013-10-20 22:18:15 -07:00
Rasmus Lerdorf
2186e1583d When src->src is null this doesn't get initialized
but it is still used, so the passed in *ze will point
to unitialized memory. Hopefully src->src is never
null, but just in case this initialization doesn't hurt.
2013-10-20 22:15:35 -07:00
Stanislav Malyshev
42cb9ac7a6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
2013-10-20 22:05:48 -07:00
Stanislav Malyshev
dab1d76e9d Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag 2013-10-20 22:04:21 -07:00
Stanislav Malyshev
646813a37a fix possibility of access to *storedType without initialization 2013-10-20 21:57:33 -07:00
Stanislav Malyshev
9aad9114e3 5.4.21 release date 2013-10-20 19:59:39 -07:00
Rasmus Lerdorf
9e4651f6f1 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix typo
2013-10-20 17:56:14 -07:00
Rasmus Lerdorf
18cc5386de Fix typo 2013-10-20 17:55:55 -07:00
Rasmus Lerdorf
2129de4569 These getpwnam('') tests are silly and not portable 2013-10-20 14:04:47 -07:00
Rasmus Lerdorf
288a4ec3bd Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Clean up this weird safe_emalloc() call
2013-10-20 09:37:25 -07:00
Rasmus Lerdorf
8f4a6d6e1b Clean up this weird safe_emalloc() call 2013-10-20 09:36:50 -07:00