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,739 Commits 494 Branches 1,367 Tags 803 MiB
bf19838c87
Commit Graph

30423 Commits

Author SHA1 Message Date
Gustavo Lopes
bf19838c87 Do not disable RFC3678 multicast API on Windows 
The API is supported since Windows Vista and requires targeting Vista
when compiling PHP. Pierre had asked to disable this by default, even
when targeting Vista/Windows Server 2008.

Since XP will not be supported anymore on php-next, any rationale
for this option will not apply anymore.
 2012-09-20 23:36:20 +02:00
Rob Richards
4b9ed49217 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix bug #63015 (Incorrect arginfo for DOMErrorHandler)
 2012-09-20 02:35:16 -04:00
Rob Richards
ffa72707c8 fix bug #63015 (Incorrect arginfo for DOMErrorHandler) 2012-09-20 02:34:07 -04:00
Lars Strojny
1c423601a8 Merge branch 'PHP-5.4' 
Conflicts:
	ext/sockets/multicast.h
 2012-09-19 22:23:22 +02:00
Lars Strojny
188c124a57 Bug #63000: MCAST_JOIN_GROUP on OSX is broken 
The multicast support in PHP 5.4 makes use of MCAST_JOIN_GROUP if it is present.
The problem is that OSX 10.7 added the constant, but did not correctly implement
the feature. This causes the setsockopt call to fail.

The solution to the problem is to not use MCAST_JOIN_GROUP on OSX.

For reference, this was also done in VLC:

* http://trac.videolan.org/vlc/ticket/6104#comment:19
 2012-09-19 22:17:35 +02:00
Lars Strojny
6793e09a4e Merge branch 'PHP-5.4' 2012-09-18 23:17:31 +02:00
Lars Strojny
ee172ce3cc Merging PR #116 2012-09-18 23:15:03 +02:00
Xinchen Hui
26ee1cb0b1 Merge branch 'PHP-5.4' 2012-09-18 10:50:24 +08:00
Xinchen Hui
e2d1eecf99 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-18 10:48:16 +08:00
Xinchen Hui
e66a5ce56f Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken) 2012-09-18 10:46:58 +08:00
Stanislav Malyshev
44e3a9be7e Merge branch 'PHP-5.4' 
* PHP-5.4:
  update news
  Support building PHP with the native client toolchain.
  test should fail
 2012-09-17 15:58:48 -07:00
Xinchen Hui
6096988704 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-17 11:21:14 +08:00
Xinchen Hui
eb881a1dd1 test should fail 2012-09-17 11:20:24 +08:00
Stanislav Malyshev
088640adb2 Merge branch 'PHp-5.4' 
* PHp-5.4:
  news for bug #61421
  commit for php bug 61421 enabling SHA2 and RMD160 for openssl signature verification
 2012-09-15 23:02:44 -07:00
Mark Jones
84202c367e commit for php bug 61421 
enabling SHA2 and RMD160 for openssl signature verification
 2012-09-15 22:59:34 -07:00
Xinchen Hui
d23f9194b1 Merge branch 'PHP-5.4' 2012-09-15 11:33:26 +08:00
Xinchen Hui
2eff69f402 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-15 11:32:08 +08:00
Xinchen Hui
1b13ff6ec7 Add XFAIL test for bug #62852 2012-09-15 11:29:47 +08:00
Xinchen Hui
e766f85405 Revert "Fixed bug #62852 (Unserialize invalid DateTime causes crash)" 
see: http://news.php.net/php.bugs/173451

This reverts commit 46a3f25772.
 2012-09-15 11:26:21 +08:00
Christopher Jones
b7fa9bfc04 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Change package.xml fix description
  Fixed bug #60901 (Improve "tail" syntax for AIX installation)
 2012-09-13 22:45:54 -07:00
Christopher Jones
3b38d14caf Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Change package.xml fix description
  Fixed bug #60901 (Improve "tail" syntax for AIX installation)
 2012-09-13 22:44:12 -07:00
Christopher Jones
9f44844d7c Change package.xml fix description 2012-09-13 22:43:10 -07:00
Christopher Jones
bbf5978e26 Fixed bug #60901 (Improve "tail" syntax for AIX installation) 2012-09-13 22:40:55 -07:00
Xinchen Hui
f6000a01e2 Capitalize the warning message 2012-09-11 18:09:47 +08:00
Xinchen Hui
79e6635cb6 Rearrange the codes, remove empty lines 2012-09-11 18:02:19 +08:00
Xinchen Hui
0146efbd41 Merge branch 'invalid-timezone' of https://github.com/simonwelsh/php-src 2012-09-11 17:58:20 +08:00
Simon Welsh
e06c47ca2a Provide a specific error message if date.timezone value is invalid. 2012-09-11 21:45:09 +12:00
Xinchen Hui
7e64681740 Merge branch 'PHP-5.4' 2012-09-11 11:44:33 +08:00
Xinchen Hui
328a3d9f13 regenerate patch, and save a strlen 2012-09-11 11:43:47 +08:00
Xinchen Hui
b5c2f532af Merge branch 'PHP-5.4' 2012-09-10 23:11:28 +08:00
Xinchen Hui
0a25a0241e Fix the wrong use of snprintf which is introduced in 1d2f619049 2012-09-10 23:08:54 +08:00
Anatoliy Belsky
b815676494 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fixed test for bug #52944 also for darwin
 2012-09-09 23:03:47 +02:00
Reeze Xia
57bebfcbdc fixed test for bug #52944 also for darwin 2012-09-09 23:02:50 +02:00
Xinchen Hui
94582f9398 year++ 
missed the .re files in 5.3
 2012-09-05 23:47:51 +08:00
Xinchen Hui
d22f18007f Merge branch 'PHP-5.4' 2012-09-05 23:44:41 +08:00
Xinchen Hui
a3d078bd8f correct PHP version & year++ 2012-09-05 23:43:59 +08:00
Xinchen Hui
5f9023ca38 Correct PHP version 2012-09-05 23:41:42 +08:00
Xinchen Hui
63d9c1f40b Merge branch 'PHP-5.4' 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2012-09-05 23:20:42 +08:00
Xinchen Hui
9d44ff640c Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/interbase/interbase.rc
 2012-09-05 23:11:19 +08:00
Xinchen Hui
d64d9e3351 year++ 2012-09-05 23:08:05 +08:00
Anatoliy Belsky
4b206126ac Merge branch 'PHP-5.4' 
* PHP-5.4:
  forked two tests for windows
 2012-09-03 13:48:02 +02:00
Anatoliy Belsky
ff0aa24054 forked two tests for windows 
* bug55544.phpt - VT vs. EXT at the start of the data block,
but the data can still be decoded correctly
* bug_52944.phpt works with the corrupted data and has some
different out

Most likely the ASM optimization under windows is responsible
for this behaviour.
 2012-09-03 13:37:34 +02:00
Dmitry Stogov
2659f5e88e Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice) 2012-09-03 11:52:42 +04:00
Dmitry Stogov
33db8c0ef6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
 2012-09-03 11:51:17 +04:00
Dmitry Stogov
485c09a376 Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice). 2012-09-03 11:49:58 +04:00
Dmitry Stogov
38476a1543 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
 2012-09-03 11:47:59 +04:00
Dmitry Stogov
7e816c0921 Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice) 2012-09-03 11:46:47 +04:00
Dmitry Stogov
4cca6241e0 Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice) 2012-09-03 11:38:08 +04:00
Lars Strojny
6fc2962b9a Merge branch 'PHP-5.4' 2012-09-02 22:11:47 +02:00
Lars Strojny
a26390ef0c Bug #49510: Boolean validation fails with FILTER_NULL_ON_FAILURE with empty string or false 2012-09-02 22:10:23 +02:00