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
70,146 Commits 494 Branches 1,367 Tags 803 MiB
d2718cb9ff
Commit Graph

70146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
9bf8cd4b34 Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2)) 2012-04-06 21:42:40 +08:00
Anatoliy Belsky
8a4ca5289a Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt
  updated the NEWS with the latest fileinfo changes
 2012-04-04 19:14:06 +02:00
Anatoliy Belsky
69b2570b72 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt
  updated the NEWS with the latest fileinfo changes

Conflicts:
	NEWS
 2012-04-04 18:54:03 +02:00
Matt Ficken
381edb425e Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt 2012-04-04 18:39:24 +02:00
Anatoliy Belsky
db834fc460 updated the NEWS with the latest fileinfo changes 2012-04-04 12:36:34 +02:00
Xinchen Hui
a1457b6ecb Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix typo
 2012-04-04 17:43:12 +08:00
Xinchen Hui
7cccb6bc5a fix typo 2012-04-04 17:41:25 +08:00
Xinchen Hui
a4fff4dc45 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Update NEWS for #61617
 2012-04-04 17:40:01 +08:00
Xinchen Hui
1215665bb4 Update NEWS for #61617 2012-04-04 17:38:43 +08:00
Xinchen Hui
1a3097373b Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61617 (Libxml tests failed(ht is already destroyed))
  Cherry-pick 4cc74767
 2012-04-04 17:38:15 +08:00
Xinchen Hui
1ff8021519 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61617 (Libxml tests failed(ht is already destroyed))
  Cherry-pick 4cc74767

Conflicts:
	NEWS
 2012-04-04 17:36:18 +08:00
Xinchen Hui
94f1c05ff8 Fixed bug #61617 (Libxml tests failed(ht is already destroyed)) 2012-04-04 17:22:37 +08:00
Gustavo André dos Santos Lopes
ca58cd01fc Cherry-pick 4cc74767 
Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227.

Conflicts:

	ext/standard/tests/general_functions/bug60227.phpt
	ext/standard/tests/general_functions/bug60227_1.phpt
	ext/standard/tests/general_functions/bug60227_2.phpt
	main/SAPI.c
 2012-04-04 09:59:51 +01:00
Xinchen Hui
d467bf1d0e Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix warning "suggest parentheses around assignment"
 2012-04-04 16:38:43 +08:00
Xinchen Hui
9882358984 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix warning "suggest parentheses around assignment"

Conflicts:
	main/SAPI.c
 2012-04-04 16:37:29 +08:00
Xinchen Hui
f7bf83546e Fix warning "suggest parentheses around assignment" 2012-04-04 16:35:32 +08:00
Xinchen Hui
06290cc049 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61605 (header_remove() does not remove all headers)

Conflicts:
	NEWS
 2012-04-04 16:16:54 +08:00
Xinchen Hui
efd671f242 Fixed bug Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:14:28 +08:00
Xinchen Hui
3ea9fa1b46 Merge branch 'PHP-5.3' into PHP-5.4 2012-04-04 16:13:02 +08:00
Xinchen Hui
896c4539df Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:01:43 +08:00
Xinchen Hui
0421ef5e2e Merge branch 'PHP-5.4' 2012-04-04 15:24:41 +08:00
Xinchen Hui
bd400829af Merge branch 'PHP-5.3' into PHP-5.4 2012-04-04 15:24:08 +08:00
Xinchen Hui
7b04638c8c Fix test 
cherry-pick from php-5.4
 2012-04-04 15:20:28 +08:00
Ilia Alshanetsky
4e40059c19 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61423 (gzip compression fails).
 2012-04-03 08:49:45 -04:00
Ilia Alshanetsky
9c5ae9954f Fixed bug #61423 (gzip compression fails). 2012-04-03 08:47:00 -04:00
Anatoliy Belsky
31cdcd3517 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61460 popen_close_error-win32 expected output is wrong
  Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails
  Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192
  Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt
 2012-04-03 14:27:43 +02:00
Anatoliy Belsky
827c446b62 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61460 popen_close_error-win32 expected output is wrong

Conflicts:
	ext/standard/tests/file/popen_pclose_error-win32.phpt
 2012-04-03 14:22:59 +02:00
Matt Ficken
438536e45e Fix bug #61460 popen_close_error-win32 expected output is wrong 2012-04-03 14:19:43 +02:00
Anatoliy Belsky
84be455e22 Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails 2012-04-03 13:28:38 +02:00
Anatoliy Belsky
c7e9c646ee Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192 2012-04-03 13:28:37 +02:00
Anatoliy Belsky
36449bface Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt 2012-04-03 13:28:37 +02:00
Anatoliy Belsky
2a8866ba5e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails
 2012-04-03 13:24:31 +02:00
Anatoliy Belsky
14e74aeb57 Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails 2012-04-03 13:23:06 +02:00
Anatoliy Belsky
b67a4cc340 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192
 2012-04-03 13:09:17 +02:00
Anatoliy Belsky
94cefaedaf Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192 2012-04-03 13:07:51 +02:00
Anatoliy Belsky
9c81654378 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt
 2012-04-03 11:08:02 +02:00
Anatoliy Belsky
469cd3abf1 Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt 2012-04-03 11:04:52 +02:00
Xinchen Hui
7a2885a591 Merge branch 'PHP-5.4' 2012-04-03 12:19:05 +08:00
Xinchen Hui
e7a36ad902 Merge branch 'PHP-5.3' into PHP-5.4 2012-04-03 12:18:42 +08:00
Xinchen Hui
6d97e28e42 Update NEWS for #61541 2012-04-03 12:13:59 +08:00
Klaus Silveira
16bd11062e Small performance improvement. The current code is correct, but if it is used inside a long loop or long strings, it's inefficient. 2012-04-02 22:54:57 -03:00
Moriyoshi Koizumi
14f120dbd9 Merge branch 'PHP-5.4' 2012-04-03 02:00:34 +09:00
Moriyoshi Koizumi
43047598c4 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	NEWS
 2012-04-03 02:00:23 +09:00
Moriyoshi Koizumi
a6c95c8a00 Reset LIBS temporarily to make sure PHP_CHECK_FUNC will look into libc. 
See Gentoo bug #364139. https://bugs.gentoo.org/show_bug.cgi?id=364139
Reported by Naohiro Aota.
 2012-04-03 01:51:23 +09: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
Pierre Joye
69e0e03457 - update to openssl 0.9.8u 2012-04-02 13:09:19 +02:00