clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
100,435 Commits 491 Branches 1,363 Tags 844 MiB
84b9b164a8
Commit Graph

439 Commits

Author SHA1 Message Date
Dmitry Stogov
dd1c68e67f Merge branch 'master' into phpng 
* master: (77 commits)
  NEWS entry for Fix potential segfault in dns_get_record()
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  Fix potential segfault in dns_get_record()
  Revert "Add optional second arg to unserialize()"
  5.5.15 now
  update NEWS
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
  Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
  Fix broken test.
  Add a mime type map generation script and update the header.
  Move the mime type map out of php_cli_server.c for easier generation.
  Replace the CLI server's linear search for extensions with a hash table.
  fix test
  Remove unused included file
  NEWS
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
  ...

Conflicts:
	Zend/zend_closures.c
	Zend/zend_execute.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/spl/spl_array.c
	ext/standard/basic_functions.c
	ext/standard/dns.c
	ext/standard/var.c
 2014-06-12 05:07:33 +04:00
Stanislav Malyshev
e35945490f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Remove superfluous echos.
 2014-06-08 13:53:01 -07:00
Jeff Welch
5fd7c2b01d Remove superfluous echos. 2014-06-08 13:50:22 -07:00
krakjoe
6cab75aaa4 fix exif, thnx laruence 2014-05-07 12:03:00 +01:00
krakjoe
0a134d1a3a phpng updates for exif 2014-05-07 07:59:45 +01:00
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Stanislav Malyshev
de4a2c3cbd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #65873 - Integer overflow in exif_read_data()
 2013-12-16 11:37:29 -08:00
Stanislav Malyshev
cbcf6e1880 Fix bug #65873 - Integer overflow in exif_read_data() 2013-12-16 11:34:24 -08: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
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
Michael Wallner
14caf174ff unify stdint type usage 
if you need C99 stdint types, just include "php_stdint.h"
 2013-08-06 22:49:56 +02:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
1b06e0be96 typo fixes 2013-07-15 00:19:49 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Nikita Popov
49e91151c0 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-14 17:37:10 +02:00
Nikita Popov
e1c610fb44 Fix exif test failure 
There are two slightly different error messages for invalid pointers, so
make the pattern slightly less strict to account for both.
 2012-08-14 17:33:38 +02:00
Felipe Pena
8779a9aad5 Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57' into PHP-5.4 2012-06-03 19:01:50 -03:00
Felipe Pena
e59b6dc0ae - Fixed information leak in ext exif (discovered by Martin Noga, Matthew "j00ru" Jurczyk, Gynvael Coldwind) 2012-06-03 15:23:07 -03:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Stanislav Malyshev
4c4185c117 fix test number 2011-11-19 04:49:59 +00:00
Stanislav Malyshev
1dfbe61e2a fix bug #60150 for 5.3 too 2011-11-19 04:49:36 +00:00
Stanislav Malyshev
5ebfe19ac6 Fix bug #60150 (Integer overflow during the parsing of invalid exif header) 2011-11-19 04:41:03 +00:00
Felipe Pena
997f323e3a - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
707a8f70b8 - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Pierrick Charron
824726073b Delete empty test files (old MQ tests) 2011-07-22 12:12:05 +00:00
Pierre Joye
45420bb669 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ, missing tests changes in 5.4 2011-07-22 11:56:20 +00:00
Pierre Joye
9805e1674a - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00
Ilia Alshanetsky
465ffa7fa2 Fixed bug #54121 (error message format string typo). 2011-04-12 18:33:08 +00:00
Ilia Alshanetsky
0e80f26207 Fixed bug #54121 (error message format string typo). 2011-04-12 18:33:08 +00:00
Dmitry Stogov
bbc879b587 Fixed multibyte related issues 2011-03-14 16:00:59 +00:00
Pierre Joye
2a7acc3f4d - fix the fix (Dmitry) and ensure that it builds everywhere, can someone test on solaris&co pls? 2011-02-15 14:02:26 +00:00
Pierre Joye
a8806be989 - fix the fix (Dmitry) and ensure that it builds everywhere, can someone test on solaris&co pls? 2011-02-15 14:02:26 +00:00
Pierre Joye
409c5a9c7b -Bug #54002, fix windows build, use the relevant values in the warnings 2011-02-14 09:40:10 +00:00
Pierre Joye
8a485c7c91 -Bug #54002, fix windows build, use the relevant values in the warnings 2011-02-14 09:40:10 +00:00
Pierre Joye
dbccc8c112 - fix bug #54002, exif_read_data crashes on crafted tags 2011-02-14 09:08:44 +00:00
Pierre Joye
0f842f667a - fix bug #54002, exif_read_data crashes on crafted tags 2011-02-14 09:08:44 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Moriyoshi Koizumi
e8b1590667 - Fix build. 2010-12-22 10:25:33 +00:00
Antony Dovgal
e89362b846 fix ZTS build 2010-12-08 12:35:25 +00:00
Dmitry Stogov
755c2cd0d8 Removed compile time dependency from ext/mbstring 2010-12-08 11:27:34 +00:00
Kalle Sommer Nielsen
a448b6a72b MFB53: Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED (Fixes #52570) 
# Some of the updated tests were to make them sync with 5.3 although they don't run on trunk anymore
 2010-08-11 21:41:30 +00:00
Kalle Sommer Nielsen
8deefa8780 Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED (Fixes #52570) 
# Trunk patch will follow shortly
 2010-08-11 21:12:18 +00:00
Rob Richards
0a34d10783 revert change #298288: Remove old dsp/dsw/makefile files 2010-04-28 14:41:51 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Kalle Sommer Nielsen
518a17e7bf Remove old dsp/dsw/makefile files, these arent used by the build system anymore and are barely updated nor available for all extensions 2010-04-21 23:36:49 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Guenter Knauf
824692fab8 removed now obsolete NetWare hack since I fixed this 
with Novell some longer time ago in their SDK header.
 2009-11-03 21:21:34 +00:00
Dmitry Stogov
7bfe056174 Fixed tests 2009-09-21 09:52:19 +00:00
Ilia Alshanetsky
4687f6e0ba MFB: Added missing sanity checks around exif processing. 2009-08-16 14:32:32 +00:00
Felipe Pena
61d723a359 - Dropped unnecessary var 2009-06-12 14:03:35 +00:00
Ilia Alshanetsky
ae5a233a62 Fixed test 2009-06-08 12:31:08 +00:00
Antony Dovgal
31c2c5ffb7 fix test 2009-05-28 13:56:44 +00:00
Pierre Joye
f002287eb3 - MFH: #48378, exif_read_data() segfaults on certain corrupted .jpeg files 2009-05-28 13:48:32 +00:00
Felipe Pena
857959838f - Fixed tests 2009-01-09 02:11:54 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Hannes Magnusson
f6cf54d2b1 Fixed bug#46847 (phpinfo() is missing some settings.) 2008-12-12 13:07:28 +00:00
Ant Phillips
ee934d356b Exif tests: checked on PHP 5.2.6, 5.3 and 6.0 (Windows, Linux and Linux 64 bit). 2008-12-01 12:25:21 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Arnaud Le Blanc
1d5ba8bb21 MFH: initialize optional vars 2008-10-21 23:39:15 +00:00
Jani Taskinen
8307bea9e6 MFH 2008-08-03 12:11:07 +00:00
David Soria Parra
375631c3b9 Exif tests from Eric Steward. Testfest task 82. 2008-07-07 23:31:54 +00:00
Antony Dovgal
6eeb67af78 more long -> int fixes 2008-07-01 07:39:33 +00:00
Pierre Joye
41976c7ab6 - do not enable an ext when a lib/header fails 
- use MESSAGE in mysql*
- use correct CFLAGS for ext/libxml headers
 2008-06-23 18:40:29 +00:00
Alexey Zakhlestin
247bf3eb4a updated to the new parameter-parsing api 2008-06-22 14:13:01 +00:00
Ilia Alshanetsky
5944170872 Fixed bug #44388 (Crash inside exif_read_data() on invalid images) 2008-03-12 17:32:01 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Jani Taskinen
31a779e813 - Fix indent of macros 2007-12-17 08:51:17 +00:00
Ilia Alshanetsky
ec90d48331 Fixed bug #43606 (define missing depencies of the exif extension) 2007-12-16 17:14:11 +00:00
Dmitry Stogov
6c810b0d4c Improved memory usage by movig constants to read only memory. (Dmitry, Pierre) 2007-09-27 18:00:48 +00:00
Ilia Alshanetsky
79d58abf65 Fixed memory corruption when reading exif data of a non-file 2007-06-10 20:12:45 +00:00
Martin Kraemer
9c62ddde34 Typo 2007-03-14 09:58:14 +00:00
Ilia Alshanetsky
cc04404b28 snprintf() -> slprintf() 
# Part 1
 2007-02-27 03:04:40 +00:00
Marcus Boerger
255c6a71d7 - MFH Readability 2007-02-25 13:09:13 +00:00
Ilia Alshanetsky
3588f9eed6 missing -1 2007-02-24 18:02:11 +00:00
Ilia Alshanetsky
9651aeaf78 Pad to given length, not replace data with spaces 2007-02-24 17:57:57 +00:00
Ilia Alshanetsky
afa4b732c5 Eliminate strncpy and simplify code 2007-02-24 17:40:45 +00:00
Marcus Boerger
1b1c62d708 - Make debug code really safe 2007-02-24 14:28:09 +00:00
Stanislav Malyshev
698f114ddc use safe allocations 2007-02-24 03:08:05 +00:00
Marcus Boerger
50ea26760d - Avoid sprintf, even when checked copy'n'paste or changes lead to errors 2007-02-24 02:17:47 +00:00
Ilia Alshanetsky
17864fc3e9 emalloc() -> safe_emalloc() 2007-01-23 00:23:17 +00:00
Marcus Boerger
023144ffa9 - MFH Fix for #40073 2007-01-09 17:55:29 +00:00
Antony Dovgal
1e352b3ae7 MFH: zerofill info_data and fix possible segfault 
partly fixes #40073
 2007-01-09 11:37:17 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Ilia Alshanetsky
e2c110bebf Allocation safety checks 2006-12-25 23:43:10 +00:00
Ilia Alshanetsky
0776e56437 Use %F (ignores locale) for internal representation of floats 2006-12-25 16:48:18 +00:00
Marcus Boerger
79946dc8a0 - MFH: Make parameter parsing api check happy 2006-11-04 20:46:32 +00:00
Antony Dovgal
cb90d3ce76 MFH: fix leak and typos in error messages 2006-10-10 22:22:43 +00:00
Antony Dovgal
1f3b6ebc89 initialize static buffer with 0's 2006-08-17 14:32:35 +00:00
Dmitry Stogov
1dbaae2795 Added automatic module globals management 2006-06-15 18:33:09 +00:00
Hannes Magnusson
3104233019 MFH: arginfo, protos, vim folding 2006-06-11 01:42:17 +00:00
Marcus Boerger
3438469b84 - MFH Fix condition 2006-04-10 18:23:24 +00:00
foobar
5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
foobar
3e669bc950 MFH: nuke php3 legacy 2005-12-06 02:28:41 +00:00
foobar
c0ec353655 fix test 2005-10-11 18:11:13 +00:00
Marcus Boerger
656f02fada - MFH Fix Logic 2005-10-10 06:09:25 +00:00
foobar
036f28f115 MFH: fix test 2005-10-10 05:57:21 +00:00
foobar
60d70459f3 extra spaces removed 2005-10-10 05:55:44 +00:00
Marcus Boerger
bc81f55541 - MFH Bugfix #34704 (Infinite recursion due to corrupt JPEG) 2005-10-09 14:40:01 +00:00
Anantha Kesari H Y
9270751a7f NetWare specific stat structure issues. 
--Kamesh
 2005-08-05 14:03:57 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
Ilia Alshanetsky
1f06bb94c6 MFB: Fixed build of exif extension on win32. 2005-03-17 17:20:52 +00:00
Stefan Esser
4d5599f6e0 Fixed possible bufferoverflow 2005-03-02 18:21:45 +00:00
Marcus Boerger
5b1af1c1ed - Change to enable (synch with unix build system) 2005-02-25 01:17:45 +00:00
foobar
3f9dc8814e PHP_WIN32 is defined or not defined. 2005-02-16 23:47:38 +00:00
Edin Kadribasic
d388e4dc16 Enable mbstring use on windows. We were linking against mbstring for 
some time now, but have never actually used it on Windows.
Fixes #31980.
 2005-02-16 09:53:26 +00:00
Ilia Alshanetsky
43d1785ea1 Fixed bug #31986 (Max nesting limit set too low). 2005-02-15 21:56:17 +00:00
Ilia Alshanetsky
8c97b9dc73 Fixed bug #31797 (exif_read_data() uses too low nesting limit). 2005-02-01 23:27:33 +00:00
Andrei Zmievski
ecb9f8668d MFB (bugfix for 24851) 2005-01-22 00:01:33 +00:00
Ilia Alshanetsky
8992aa0bcf Fixed possible overflow. 2004-11-10 01:43:04 +00:00
Marcus Boerger
28ced40c63 Bug #30627 2004-11-04 20:13:30 +00:00
Hartmut Holzgraefe
eeb172b29f "The Visa to Sibiria" (work in progress) 
Adding a package.xml to a bundled extension does not only
ease the transition to PECL whereever suitable but also
allows to build and install an extension as "shared" using
the PEAR installer without having to deal with phpize and
friends by hand
 2004-03-23 19:46:10 +00:00
Derick Rethans
1e8e284c6b - Fixed typo 2004-03-16 20:58:01 +00:00
foobar
f4983c0d3f - Renamed all *php4* files to *php5*, changed all php4/PHP4 to php5/PHP5 2004-01-17 13:00:38 +00:00
foobar
ccfc46b0aa - Happy new year and PHP 5 for rest of the files too.. 
# Should the LICENSE and Zend/LICENSE dates be updated too?
 2004-01-08 17:33:29 +00:00
Andi Gutmans
dbeb4158d2 - A belated happy holidays and PHP 5 2004-01-08 08:18:22 +00:00
Marcus Boerger
8a072165f5 Typos found by Petras Kudaras. 2003-12-22 23:45:53 +00:00
Wez Furlong
3b450ec431 Add dependencies for these extensions 2003-12-22 13:16:43 +00:00
Marcus Boerger
a841334860 Fix warning 2003-12-17 09:07:11 +00:00
Ilia Alshanetsky
56f046a67a Fixed ZTS build. 2003-12-10 21:23:35 +00:00
Frank M. Kromann
075ee21165 Include exif in the new win32 build system 2003-12-05 07:17:11 +00:00
Ilia Alshanetsky
4aaa2becbe String format stuff. 2003-09-22 23:27:51 +00:00
Marcus Boerger
93a07f6c68 Allow to search for section FILE with 2nd parameter (found by Derick) 2003-09-07 23:46:33 +00:00
Marcus Boerger
ae2c7b9b4f Fix warnings 2003-08-17 18:21:35 +00:00
Sascha Schumann
2405caf32e kill some warnings 2003-08-17 15:04:57 +00:00
Marcus Boerger
30a68c8d84 Fix exif_thumbnail 2003-08-09 20:43:06 +00:00
Zeev Suraski
538d58dd5f Use new infrastructure. 
There are bound to be some messups, please report build/runtime bugs!
 2003-08-03 17:44:39 +00:00
Marcus Boerger
c5d4b5ddcd - Errors, warnings and notices start with a capital letter. 
- Show sorcode info when debugging exif.
 2003-06-20 18:24:38 +00:00
Edin Kadribasic
e92e7d47c5 Fixed win32 build 2003-06-15 22:58:04 +00:00
Andrey Hristov
eb33adf139 proto fixes 2003-06-15 15:29:46 +00:00
James Cox
f68c7ff249 updating license information in the headers. 2003-06-10 20:04:29 +00:00
Marcus Boerger
6f524ac9f1 Use safe_estrdup() instead. 
# Thanks Sascha i didn't knew about that thing.
 2003-05-30 18:59:49 +00:00
Marcus Boerger
07ba5f6c9e Fix handling of ini settings 2003-05-30 17:46:57 +00:00
Hartmut Holzgraefe
e6490c4a41 basename() now binary safe, testcases added 2003-05-05 13:46:14 +00:00
Marcus Boerger
8363658641 Change to use safe_emalloc() and provide macro for now 2003-04-16 06:10:41 +00:00
Ilia Alshanetsky
b2e521a178 Fixed bug #23102 (integer overflow in exif_iif_add_value()). 2003-04-08 00:18:57 +00:00