clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,024 Commits 494 Branches 1,367 Tags 800 MiB
55440b0870
Commit Graph

584 Commits

Author SHA1 Message Date
Stanislav Malyshev
6a0212ea88 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fd fix
  fix bug #61065

Conflicts:
	UPGRADING
 2012-05-15 22:39:17 -07:00
Stanislav Malyshev
a10e778bfb fix bug #61065 2012-05-15 22:34:34 -07:00
Anatoliy Belsky
e3f2c76989 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
 2012-05-09 13:06:47 +02:00
Anatoliy Belsky
f76d7be876 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
 2012-05-09 13:04:32 +02:00
Anatoliy Belsky
7fb16d5bd9 Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails 
Another error message is produced by win specific code
 2012-05-09 13:02:33 +02:00
Anatoliy Belsky
2c505ecc57 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
  Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
 2012-05-07 15:40:48 +02:00
Anatoliy Belsky
09664063a8 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
  Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
 2012-05-07 15:40:16 +02:00
Anatoliy Belsky
2068419ae5 Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails 2012-05-07 15:39:07 +02:00
Anatoliy Belsky
ce59121c5f Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails 2012-05-07 15:37:29 +02:00
Anatoliy Belsky
56ac0e71bb Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
 2012-05-04 11:42:28 +02:00
Anatoliy Belsky
f5936cceeb Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
 2012-05-04 11:42:05 +02:00
Anatoliy Belsky
8a10259642 Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails 2012-05-04 11:40:49 +02:00
Anatoliy Belsky
7388c085bf Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
  Bump to next version

Conflicts:
	configure.in
	main/php_version.h
 2012-05-04 11:38:43 +02:00
Anatoliy Belsky
16fdf86ea3 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
 2012-05-04 11:32:12 +02:00
Anatoliy Belsky
6c12252790 Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt 2012-05-04 11:29:49 +02:00
Anatoliy Belsky
62de1cfe33 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
 2012-05-02 21:42:57 +02:00
Anatoliy Belsky
cdce62b724 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
 2012-05-02 21:41:33 +02:00
Anatoliy Belsky
69ed09a31c Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis 
openssl needs explicit openssl.cnf on windows
 2012-05-02 21:38:32 +02:00
Anatoliy Belsky
2ceafc7e33 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
 2012-03-28 13:19:45 +02:00
Anatoliy Belsky
d406f2b034 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
 2012-03-28 12:56:17 +02:00
Anatoliy Belsky
0b20329aaf Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails 2012-03-28 12:54:19 +02:00
Stanislav Malyshev
d780b4e4b3 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix tests
 2012-03-25 13:50:33 -07:00
Stanislav Malyshev
d51c1e0a4c fix tests 2012-03-25 13:49:19 -07:00
David Soria Parra
6e7284fb5b Merge branch 'PHP-5.4' 
* PHP-5.4:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
 2012-03-20 17:59:33 +01:00
David Soria Parra
c918ca57a7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
 2012-03-20 17:58:58 +01:00
David Soria Parra
f7b10abae9 Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
Nikita Popov
d256caf781 Merge: Fix bug #61184 Phar::webPhar() generates headers with trailing NUL bytes 2012-03-02 08:21:54 +00:00
Nikita Popov
032bbc3164 Fix headers generated by phar 
sapi_header_line.line_len is the length without null terminator, so one has to
take sizeof - 1. This fixes some test failures as the NUL bytes were causing
warnings.

Needs to be merged to 5.4.
 2012-02-18 13:39:13 +00:00
Nikita Popov
daa190f8fd Fix headers generated by phar 
sapi_header_line.line_len is the length without null terminator, so one has to
take sizeof - 1. This fixes some test failures as the NUL bytes were causing
warnings.

Needs to be merged to 5.4.
 2012-02-18 13:39:13 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Christopher Jones
77b821d3c5 Fix skipif 2011-12-08 20:43:23 +00:00
Christopher Jones
20f0acae85 Fix skipif 2011-12-08 20:43:23 +00:00
Christopher Jones
726b31cfc9 Fix skipif 2011-12-08 20:43:23 +00:00
Pierre Joye
4e172842a2 - force LF 2011-12-06 13:42:08 +00:00
Pierre Joye
c46e5a1b7d - add windows version of this test 2011-12-06 13:35:41 +00:00
Pierre Joye
c55364eb05 - add windows version of this test 2011-12-06 13:35:41 +00:00
Pierre Joye
8d73eb77ed - add windows version of this test 2011-12-06 13:34:45 +00:00
Pierre Joye
0c4915d580 - add windows version of this test 2011-12-06 13:34:45 +00:00
Pierre Joye
65f0630552 - add windows version of this test 2011-12-06 13:34:45 +00:00
Pierre Joye
4a91e36366 - force LF 2011-12-06 13:16:40 +00:00
Pierre Joye
bbeaed1cca - force LF 2011-12-06 13:16:40 +00:00
Pierre Joye
d2fad53032 - force LF 2011-12-06 13:07:08 +00:00
Pierre Joye
74cf85e19d - force LF 2011-12-06 13:07:08 +00:00
Pierre Joye
72004f29c2 - restore correct window_size 2011-11-20 10:10:43 +00:00
Pierre Joye
a495e3759c - restore correct window_size 2011-11-20 10:10:43 +00:00
Pierre Joye
f330c8ab4e - restore correct window_size 2011-11-20 10:10:43 +00:00
Pierre Joye
1e8fc920e1 - fix build, ansi c requires constant value, no expresion, even constant var 2011-11-19 23:09:12 +00:00
Pierre Joye
76e3964c1c - fix build, ansi c requires constant value, no expresion, even constant var 2011-11-19 23:09:12 +00:00
Pierre Joye
eeba0b5681 - fix build, ansi c requires constant value, no expresion, even constant var 2011-11-19 23:09:12 +00:00
Stanislav Malyshev
9fe3a605c6 fix bug #60164 (Stubs of a specific length break phar_open_from_fp scanning for __HALT_COMPILER) 2011-11-19 04:59:56 +00:00
Stanislav Malyshev
449907fb76 fix bug #60164 (Stubs of a specific length break phar_open_from_fp scanning for __HALT_COMPILER) 2011-11-19 04:59:56 +00:00
Stanislav Malyshev
22cbdd5cc5 fix bug #60164 (Stubs of a specific length break phar_open_from_fp scanning for __HALT_COMPILER) 2011-11-19 04:59:56 +00:00
Felipe Pena
28d1bc37e2 - Fixed bug #60261 (phar dos null pointer) 2011-11-11 21:39:11 +00:00
Felipe Pena
c1e510aea8 - Fixed bug #60261 (phar dos null pointer) 2011-11-11 21:39:11 +00:00
Felipe Pena
72a133f155 - Fixed bug #60261 (phar dos null pointer) 2011-11-11 21:39:11 +00:00
Ferenc Kovacs
7888715e73 the mandatory __construct() for SPL classes was reverted in r318566 2011-11-05 16:49:56 +00:00
Ferenc Kovacs
80d1553746 the mandatory __construct() for SPL classes was reverted in r318566 2011-11-05 16:49:56 +00:00
Xinchen Hui
3fd08b3bd4 Fix tests due to bison depened message format 2011-09-25 03:35:57 +00:00
Xinchen Hui
6d2a0bd6cc Fix tests due to bison depened message format 2011-09-25 03:35:57 +00:00
Christopher Jones
ef83bd744c Fix skipif for non zlib builds re message http://lxr.php.net/opengrok/xref/PHP_TRUNK/ext/phar/phar_object.c#351 2011-09-15 17:23:29 +00:00
Christopher Jones
3e55ec1e93 Fix skipif for non zlib builds re message http://lxr.php.net/opengrok/xref/PHP_TRUNK/ext/phar/phar_object.c#351 2011-09-15 17:23:29 +00:00
Christopher Jones
a0526b9452 Fix skipif for non zlib builds re message http://lxr.php.net/opengrok/xref/PHP_TRUNK/ext/phar/phar_object.c#351 2011-09-15 17:23:29 +00:00
Dmitry Stogov
4a25a7740d Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Dmitry Stogov
e43ff1359e Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Xinchen Hui
17858fc789 Merge from branch, make things consistent 2011-09-12 10:57:26 +00:00
Stanislav Malyshev
666d301ee3 Fix error message 2011-09-10 05:36:14 +00:00
Stanislav Malyshev
2a6a890c46 Fix error message 2011-09-10 05:36:14 +00:00
Ulf Wendel
78b2f1c488 Fixing SKIPIF fatal error. 6.0 is history, thus SKIPIF might need further updates? 2011-09-06 16:30:53 +00:00
Ulf Wendel
cd0c221f82 Fixing SKIPIF fatal error. 6.0 is history, thus SKIPIF might need further updates? 2011-09-06 16:30:53 +00:00
Ulf Wendel
6277b2857a Fixing SKIPIF fatal error. 6.0 is history, thus SKIPIF might need further updates? 2011-09-06 16:30:53 +00:00
Pierre Joye
8f7fab9358 - add skipif 2011-09-06 06:52:26 +00:00
Pierre Joye
dd855aec8b - add skipif 2011-09-06 06:52:26 +00:00
Pierre Joye
b6fe362f12 - add skipif 2011-09-06 06:52:26 +00:00
Xinchen Hui
67872cf7a9 Fixed tests (due to error message changed) 2011-09-05 15:05:51 +00:00
Xinchen Hui
f249361559 Fixed tests (due to error message changed) 2011-09-05 15:05:51 +00:00
Hannes Magnusson
e723c7631c Fixed bug#53872 (internal corruption of phar) 2011-08-29 16:05:45 +00:00
Hannes Magnusson
8e74e30411 Fixed bug#53872 (internal corruption of phar) 2011-08-29 16:05:45 +00:00
Hannes Magnusson
25352ba350 Fixed bug#53872 (internal corruption of phar) 2011-08-29 16:05:45 +00:00
Hannes Magnusson
2c2c113b77 Changed error messages 2011-08-29 14:29:40 +00:00
Hannes Magnusson
58747dff3a Changed error messages 2011-08-29 14:29:40 +00:00
Hannes Magnusson
269724ebcc Whopsy, this change in 5.4, not 5.3 2011-08-29 14:27:17 +00:00
Hannes Magnusson
3a5f7c6348 Fixed bug#52013 (Unable to decompress files in a compressed phar) 2011-08-29 14:19:54 +00:00
Hannes Magnusson
8a83fee12a Fixed bug#52013 (Unable to decompress files in a compressed phar) 2011-08-29 14:19:54 +00:00
Hannes Magnusson
9e20746611 Fixed bug#52013 (Unable to decompress files in a compressed phar) 2011-08-29 14:19:54 +00:00
Hannes Magnusson
fac70ca0f4 The Phar class extends RecursiveDirectoryIterator, which has changed the way it ensures its ctor is called 2011-08-29 14:17:41 +00:00
Hannes Magnusson
5519b2ebe1 The Phar class extends RecursiveDirectoryIterator, which has changed the way it ensures its ctor is called 2011-08-29 14:17:41 +00:00
Hannes Magnusson
abbf8be0d6 The Phar class extends RecursiveDirectoryIterator, which has changed the way it ensures its ctor is called 2011-08-29 14:17:41 +00:00
Ilia Alshanetsky
1488704098 Make static analyzers happy 2011-08-09 14:11:56 +00:00
Ilia Alshanetsky
47632aa725 Make static analyzers happy 2011-08-09 14:11:56 +00:00
Ilia Alshanetsky
de6cd955d6 Make static analyzers happy 2011-08-09 14:11:56 +00:00
Rasmus Lerdorf
d4a716b19d Fix more signed 1-bit bitfield, and let's use strlcpy/strlcat instead for these 
static string copies
 2011-08-07 16:10:34 +00:00
Rasmus Lerdorf
d9845c2046 More signed 1-bit bitfields 2011-08-07 15:57:35 +00:00
Xinchen Hui
4c2e6c1cf6 Initialize variable with fixed value for avoiding compile warnings 2011-08-07 11:13:27 +00:00
Xinchen Hui
937f7fa876 Initialize variable with fixed value for avoiding compile warnings 2011-08-07 11:13:27 +00:00
Xinchen Hui
cc42ac9d9b Initialize variable with fixed value for avoiding compile warnings 2011-08-07 11:13:27 +00:00
Pierrick Charron
757a32cd0c Pointer returned is never used 2011-08-07 05:46:31 +00:00
Pierrick Charron
21232aa9f2 Pointer returned is never used 2011-08-07 05:46:31 +00:00
Pierrick Charron
4f0c7670ea Pointer returned is never used 2011-08-07 05:46:31 +00:00
Xinchen Hui
ad0cfd9865 Initialize temp with 0, avoiding compile warning 2011-08-07 05:24:11 +00:00
Xinchen Hui
66527e38cc Fixed the bug that temp may depend on a uninitialzed value 2011-08-07 05:19:55 +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
9480eace41 - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
2df7afeb1c - Revert accidental change 2011-07-25 21:39:53 +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
Felipe Pena
da376383e8 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +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
Pierre Joye
cc1c7af037 - 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
3964ddd1c4 - Added missing void param checks, and fix arginfo 2011-06-18 22:48:31 +00:00
Felipe Pena
5992c06441 - Added missing void param checks, and fix arginfo 2011-06-18 22:48:31 +00:00
Felipe Pena
8c3335b96b - Added missing void param checks, and fix arginfo 2011-06-18 22:48:31 +00:00
Felipe Pena
bf1779e973 - Added missing arginfos for void params and void param checks 2011-06-18 15:56:14 +00:00
Felipe Pena
ebf9db550f - Added missing arginfos for void params and void param checks 2011-06-18 15:56:14 +00:00
Felipe Pena
2b309c8f9e - Added missing arginfos for void params and void param checks 2011-06-18 15:56:14 +00:00
Christopher Jones
444289e03e Fix skipif to resolve the common reason this test fails 2011-06-17 18:28:34 +00:00
Christopher Jones
dba594a4e2 Fix skipif to resolve the common reason this test fails 2011-06-17 18:28:34 +00:00
Christopher Jones
21abc2f1c1 Fix skipif to resolve the common reason this test fails 2011-06-17 18:28:34 +00:00
Felipe Pena
0a0443f07c - Missing fixes for grammar fix 's/valid path/a valid path/' 2011-06-09 00:23:43 +00:00
Felipe Pena
8f4d497964 - Missing fixes for grammar fix 's/valid path/a valid path/' 2011-06-09 00:23:43 +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
Felipe Pena
4737910b69 - 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
Johannes Schlüter
ac96bcdc90 - Handle error if tempfile can't be opened, found by parfait 2011-05-16 22:24:41 +00:00
Johannes Schlüter
103ded60c0 - Handle error if tempfile can't be opened, found by parfait 2011-05-16 22:24:41 +00:00
Johannes Schlüter
c61d125986 - Handle error if tempfile can't be opened, found by parfait 2011-05-16 22:24:41 +00:00
Felipe Pena
4929964a5d - Fixed bug #54395 (Phar::mount() crashes when calling with wrong parameters) 2011-03-26 17:02:34 +00:00
Felipe Pena
3acdca4703 - Fixed bug #54395 (Phar::mount() crashes when calling with wrong parameters) 2011-03-26 17:02:34 +00:00
Felipe Pena
6da18ca967 - Missing fixes for bug #54247 2011-03-14 14:12:42 +00:00
Felipe Pena
0be5ca5b3c - Missing fixes for bug #54247 2011-03-14 14:12:42 +00:00
Felipe Pena
8d816ed0ef - Fixed bug #54247 (format-string vulnerability on Phar) 2011-03-14 13:54:41 +00:00
Felipe Pena
fe91aeaaac - Fixed bug #54247 (format-string vulnerability on Phar) 2011-03-14 13:54:41 +00:00
Nuno Lopes
8d2d7255ec MFB: fix lcov build (r308657) 2011-02-25 09:37:33 +00:00
Nuno Lopes
e79bf567e8 fix lcov build 2011-02-25 09:32:17 +00:00
Ilia Alshanetsky
baf5d66614 Fixed bug #53898 (PHAR reports invalid error message, when the directory does not exist). 2011-02-01 14:01:00 +00:00
Ilia Alshanetsky
0927309852 Fixed bug #53898 (PHAR reports invalid error message, when the directory does not exist). 2011-02-01 14:01:00 +00:00
Ilia Alshanetsky
f4c468481a Fixed variable overloading 2011-01-20 19:32:36 +00:00
Ilia Alshanetsky
e3d1ab787f Fixed variable overloading 2011-01-20 19:32:36 +00:00
Felipe Pena
12d2104277 - Year++ 2011-01-01 02:48:19 +00:00
Felipe Pena
d90a33d51c - Year++ 2011-01-01 02:46:03 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Eyal Teutsch
8d9307ace4 removed extra ?> from the FILE section 2010-12-30 14:36:01 +00:00
Eyal Teutsch
6f8b1ce7c7 removed extra ?> from the FILE section 2010-12-30 14:36:01 +00:00
Eyal Teutsch
5b5e89bb36 using PWD which is supported by run-tests.php, rather than $cwd 2010-12-26 09:47:50 +00:00
Eyal Teutsch
8533e37d0c using PWD which is supported by run-tests.php, rather than $cwd 2010-12-26 09:47:50 +00:00
Ilia Alshanetsky
9c30a3398a Fixed bug #53541 (format string bug in ext/phar). 2010-12-14 17:00:36 +00:00
Ilia Alshanetsky
c946ff2f51 Fixed bug #53541 (format string bug in ext/phar). 2010-12-14 17:00:36 +00:00
Dmitry Stogov
ab93d8c621 Added multibyte suppport by default. Previosly php had to be compiled with --enable-zend-multibyte. Now it can be enabled or disabled throug zend.multibyte directive in php.ini 2010-11-24 05:41:23 +00:00