Commit Graph

76446 Commits

Author SHA1 Message Date
Yasuo Ohgaki
37fb8e0c15 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-26 10:43:14 +09: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
Michael Wallner
dfe4b15b8e ldap_escape() notes 2013-10-24 10:36:44 +02:00
Adam Harvey
96b6d4be49 Merge branch 'PHP-5.5'
* PHP-5.5:
  Increment version number, since this will be 5.5.6.

Conflicts:
	configure.in
	main/php_version.h
2013-10-23 12:39:16 -07:00
Adam Harvey
70c3a722e2 Increment version number, since this will be 5.5.6. 2013-10-23 12:36:27 -07:00
Xinchen Hui
5241cf7000 Merge branch 'PHP-5.5' 2013-10-23 19:27:48 +08: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
Christopher Jones
e68c1ef2ec Added a LICENSE file to make it easier for PECL binary distributions to conform with the license. 2013-10-22 11:03:09 -07:00
Yasuo Ohgaki
29e5a9659f Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix Coverity issue reporting wrong sizeof()
2013-10-22 12:30:24 +09:00
Yasuo Ohgaki
fa11c7c1cc Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (270 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 argument type & remove warning
  fix const warnings in intl methods
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  fix possibility of access to *storedType without initialization
  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
  ...
2013-10-22 12:29:41 +09: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
b3a2b44198 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
2013-10-21 14:21:19 -07: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
d15cedfba9 Merge branch 'PHP-5.5'
* PHP-5.5:
  exif NEWS
2013-10-21 22:45:12 +02: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
cfd911473b Merge branch 'PHP-5.5'
* PHP-5.5:
  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:16:21 +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
605b3c2ca1 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #65936 (dangling context pointer causes crash)
2013-10-21 15:10:15 +04: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
4ddbb7dd15 Merge remote-tracking branch 'refs/remotes/origin/master'
* refs/remotes/origin/master:
  Fixed compilation warning
2013-10-21 12:23:10 +02: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
6764993358 Merge branch 'PHP-5.5'
* PHP-5.5:
  remove TRAVIS check in test source
  Just SKIP that test on travis
2013-10-21 12:21:21 +02:00
Michael Wallner
fb610b4e80 remove TRAVIS check in test source 2013-10-21 12:18:58 +02:00
Dmitry Stogov
02214e7a22 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed compilation warning
2013-10-21 14:18:17 +04: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
Michael Wallner
454a9fcb14 Merge branch 'master' of https://github.com/guggemand/php-src
* 'master' of https://github.com/guggemand/php-src:
  Dont reset other counters when incrementing slow_rq
2013-10-21 12:04:37 +02:00
Michael Wallner
41da537614 Merge branch 'master' of https://github.com/DylanArnold/php-src
* 'master' of https://github.com/DylanArnold/php-src:
  Call php_module_shutdown() for php-fpm child processes
2013-10-21 12:04:06 +02:00
Xinchen Hui
aed56fc9a7 Merge branch 'PHP-5.5' 2013-10-21 17:41:03 +08:00
Xinchen Hui
098855433d Fixed issue #115 (path issue when using phar). 2013-10-21 17:40:39 +08:00
Stanislav Malyshev
19e8052be3 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix memory leak on error (from Coverity scan)
2013-10-21 00:02:33 -07: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
ae31a68774 Merge branch 'PHP-5.5'
* PHP-5.5:
  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
  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
2013-10-20 23:04:41 -07:00
Stanislav Malyshev
3900ce97a3 fix argument type & remove warning 2013-10-20 23:04:38 -07:00
Stanislav Malyshev
06954d1bc1 fix const warnings in intl methods 2013-10-20 23:04:38 -07:00
Stanislav Malyshev
444612cdc4 Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag 2013-10-20 23:04:38 -07:00
Stanislav Malyshev
219a682e8e fix possibility of access to *storedType without initialization 2013-10-20 23:04:38 -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