clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 07:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,119 Commits 494 Branches 1,367 Tags 803 MiB
38fb89f91d
Commit Graph

196 Commits

Author SHA1 Message Date
Xinchen Hui
6d10bdff9f Merge branch 'PHP-5.4' 
* PHP-5.4:
  Update libmagic.patch
 2012-07-15 18:27:29 +08:00
Xinchen Hui
c8f285d190 Update libmagic.patch 2012-07-15 18:25:58 +08:00
Stanislav Malyshev
bbb5eba871 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61964 (finfo_open with directory cause invalid free)
 2012-07-14 18:53:30 -07:00
Stanislav Malyshev
1916bb223e Merge branch 'pull-request/91' into PHP-5.4 
* pull-request/91:
  Fixed bug #61964 (finfo_open with directory cause invalid free)
 2012-07-14 18:52:24 -07:00
Anatoliy Belsky
9cfb176116 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fixed the test for warnings changed
 2012-07-12 18:30:09 +02:00
Anatoliy Belsky
cf91b163e1 fixed the test for warnings changed 2012-07-12 18:24:38 +02:00
Anatoliy Belsky
b04e8145c9 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #62270 Test bug - ext/fileinfo/tests/finfo_open_error-win32
 2012-06-14 18:01:23 +02:00
Anatoliy Belsky
3faebe2bec Fix bug #62270 Test bug - ext/fileinfo/tests/finfo_open_error-win32 2012-06-14 17:59:39 +02:00
Anatoliy Belsky
9a9362cb09 Merge branch 'PHP-5.4' 
* PHP-5.4:
  updated the libmagic patch after Felipes regex fix
 2012-05-29 17:42:35 +02:00
Anatoliy Belsky
6074da9809 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  updated the libmagic patch after Felipes regex fix
 2012-05-29 17:41:57 +02:00
Anatoliy Belsky
8d5e953a19 updated the libmagic patch after Felipes regex fix 2012-05-29 17:38:30 +02:00
Anatoliy Belsky
3a35479e59 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
  Bug #62177 deactivate the linux test version on win
  Fix bug #62177 Test Bug - finfo_file_regex.phpt
 2012-05-29 16:43:40 +02:00
Anatoliy Belsky
c0e046a130 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
  Bug #62177 deactivate the linux test version on win
  Fix bug #62177 Test Bug - finfo_file_regex.phpt
 2012-05-29 16:43:20 +02:00
Matt Ficken
ad0371ac7e Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt 2012-05-29 16:38:57 +02:00
Matt Ficken
b4b0aaae93 Bug #62177 deactivate the linux test version on win 2012-05-29 16:37:19 +02:00
Matt Ficken
dbc727373c Fix bug #62177 Test Bug - finfo_file_regex.phpt 2012-05-29 16:31:47 +02:00
Reeze Xia
1d2f619049 Fixed bug #61964 (finfo_open with directory cause invalid free) 2012-05-25 18:55:34 +08:00
Felipe Pena
3bd0a52468 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed magic file regex support
 2012-05-24 13:43:53 -03:00
Felipe Pena
84b2c39920 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Fixed magic file regex support
 2012-05-24 13:43:35 -03:00
Felipe Pena
11b4f3becd - Fixed magic file regex support 2012-05-24 13:42:47 -03:00
Anatoliy Belsky
da1b534601 Fix bug #61811 three of finfo tests failed, see also #61812. 
The remaining two was assidentially merged back from 5.4
 2012-04-22 19:26:54 +02:00
Xinchen Hui
c530fd9536 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed warning implicit declaration of function 'file_printedlen'
 2012-04-22 20:00:07 +08:00
Xinchen Hui
0d115ca211 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed warning implicit declaration of function 'file_printedlen'
 2012-04-22 19:59:46 +08:00
Xinchen Hui
f13b0ede07 Fixed warning implicit declaration of function 'file_printedlen' 2012-04-22 19:52:07 +08:00
Xinchen Hui
1b1e91167e Merge branch 'PHP-5.4' 
* PHP-5.4:
  Update NEWS
  Fixed bug #61812 (Uninitialised value used in libmagic)
 2012-04-22 19:40:22 +08:00
Xinchen Hui
b225330707 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61812 (Uninitialised value used in libmagic)
 2012-04-22 19:39:02 +08:00
Xinchen Hui
c06e92a533 Fixed bug #61812 (Uninitialised value used in libmagic) 2012-04-22 19:38:14 +08:00
Anatoliy Belsky
94d4bb86b4 Merge branch 'PHP-5.4' 
* PHP-5.4:
  updated the libmagic.patch
  Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
  Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails
  - update to openssl 0.9.8u
  - update to openssl 0.9.8u
 2012-04-02 17:43:23 +02:00
Anatoliy Belsky
374646c36b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  updated the libmagic.patch
  Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
  Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails
  - update to openssl 0.9.8u

Conflicts:
	ext/fileinfo/tests/finfo_open_001.phpt
	ext/fileinfo/tests/finfo_open_error.phpt
	win32/build/libs_version.txt
 2012-04-02 17:36:50 +02:00
Anatoliy Belsky
8684fb7fac updated the libmagic.patch 2012-04-02 17:27:23 +02:00
Anatoliy Belsky
909713e233 Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails 
This patch fixes the failure caused by the
posix lseek and read versions under windows in cdf_read() .
Additionally all the occurences of lseek and read
was replaced by _lseek and _reed for windows.
 2012-04-02 17:22:46 +02:00
Anatoliy Belsky
0cdba53aae Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails 2012-04-02 17:19:09 +02:00
Anatoliy Belsky
17241a9983 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Bug 61504 updated libmagic.patch
  Bug #61504 TSRML_FETCH() must be last
 2012-03-28 12:11:29 +02:00
Anatoliy Belsky
4f23ee8f5e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Bug 61504 updated libmagic.patch
  Bug #61504 TSRML_FETCH() must be last
 2012-03-28 12:10:25 +02:00
Anatoliy Belsky
11f04c3524 Bug 61504 updated libmagic.patch 2012-03-28 12:06:09 +02:00
Anatoliy Belsky
e7fa402c7c Bug #61504 TSRML_FETCH() must be last 2012-03-28 12:05:20 +02:00
Gustavo André dos Santos Lopes
067603106e Restored the good part of 74ee335 that was just reverted. 2012-03-28 08:43:41 +01:00
Gustavo André dos Santos Lopes
c6e15455a3 Revert "- fix bug #61504, fix build errors on windows and possibly other" 
This reverts commit 74ee335e3a.
 2012-03-28 08:41:18 +01:00
Pierre Joye
13bd9c2c3d Merge branch 'PHP-5.4' 
* PHP-5.4:
  - fix bug #61504, fix build errors on windows and possibly other

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
 2012-03-28 02:15:02 +02:00
Pierre Joye
c195596280 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - fix bug #61504, fix build errors on windows and possibly other

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
 2012-03-28 02:11:06 +02:00
Pierre Joye
74ee335e3a - fix bug #61504, fix build errors on windows and possibly other 2012-03-28 01:59:41 +02:00
Pierre Joye
63e58b6f3f Merge branch 'PHP-5.4' 
* PHP-5.4:
  - fix test for 5.11
  Fix bug #61504, potential vuln. in fileinfo. update to 5.11
 2012-03-27 14:02:35 +02:00
Pierre Joye
a8174653e3 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - fix test for 5.11
  Fix bug #61504, potential vuln. in fileinfo. update to 5.11
 2012-03-27 14:02:07 +02:00
Pierre Joye
d0e3289d12 - fix test for 5.11 2012-03-27 14:01:38 +02:00
Pierre Joye
12cf930a40 Fix bug #61504, potential vuln. in fileinfo. update to 5.11 2012-03-27 13:34:46 +02:00
Xinchen Hui
f6e7320da8 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix test, which was broken by the fix for #61173
 2012-03-22 17:18:16 +08:00
Xinchen Hui
2dbced096a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix test, which was broken by the fix for #61173

Conflicts:
	ext/fileinfo/tests/finfo_open_error.phpt
 2012-03-22 17:17:42 +08:00
Xinchen Hui
e96a172114 Fix test, which was broken by the fix for #61173 2012-03-22 17:10:03 +08:00
Stanislav Malyshev
5e80c05deb MFH: Fixed bug #61173 (Unable to detect error from finfo constructor). 2012-03-07 07:38:57 +00:00
Stanislav Malyshev
f43330a371 remove -dev for release 2012-02-28 18:43:44 +00:00