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,989 Commits 494 Branches 1,367 Tags 803 MiB
54cbf5315c
Commit Graph

71989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lars Strojny
dd6b7ea7bd Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4 2012-09-19 22:18:16 +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
Xinchen Hui
2211300864 Merge branch 'PHP-5.4' 2012-09-19 19:52:38 +08:00
Xinchen Hui
4571d7824a Merge branch 'PHP-5.3' into PHP-5.4 2012-09-19 19:44:18 +08:00
Xinchen Hui
fd0b3ea663 Fixed bug #61442 (exception threw in __autoload can not be catched) 2012-09-19 19:40:59 +08: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
Lars Strojny
d0e96a5575 Merge branch 'PHP-5.4' 2012-09-18 22:17:36 +02:00
Lars Strojny
aa133ea282 Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserver 2012-09-18 22:16:51 +02:00
Anatoliy Belsky
7be5e7539c Merge branch 'PHP-5.4' 
* PHP-5.4:
  updated libary versions
 2012-09-18 10:20:47 +02:00
Anatoliy Belsky
1e1db9d9bb Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  updated libary versions

Conflicts:
	win32/build/libs_version.txt
 2012-09-18 10:20:05 +02:00
Anatoliy Belsky
6752f38ccc updated libary versions 2012-09-18 10:18:26 +02:00
Anatoliy Belsky
d23efb137b Merge branch 'PHP-5.4' 
* PHP-5.4:
  split tests for the new zlib version on win
 2012-09-18 10:02:33 +02:00
Anatoliy Belsky
bb276c6155 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  split tests for the new zlib version on win
 2012-09-18 10:02:05 +02:00
Anatoliy Belsky
3ad033ffba split tests for the new zlib version on win 2012-09-18 09:59:49 +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
Stanislav Malyshev
d0ab22e829 update news 2012-09-17 15:58:27 -07:00
Stuart Langley
2e24d9a2b3 Support building PHP with the native client toolchain. 
The native client compiler defines the C macro __x86_64__, but the size
of an unsigned int is only 4 bytes. This causes the compile to fail
because the inline asm code compiled is for an 8 byte unsigned int. Add
the correct defines to fix this.

As detailed in:
http://code.google.com/p/nativeclient/issues/detail?id=2255
 2012-09-17 15:52:55 -07:00
Anthony Ferrara
8bd79d1807 Refactor slightly to enable cleaner readability 2012-09-17 11:43:47 -04:00
Anthony Ferrara
6fd5ba5c8d Fix arg info for required params passed to needs_rehash 2012-09-17 11:10:59 -04:00
Anthony Ferrara
44c2624f8c Fix ucwords error casing 2012-09-17 10:59:51 -04:00
Anthony Ferrara
e034a46bdc A bunch of naming convention fixes. No functionality changes 2012-09-17 10:52:07 -04: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
Nikita Popov
f163c70fea Add NEWS for generators 2012-09-16 22:02:47 +02:00
Nikita Popov
a47c11a13d Fix two op_array -> function cast warnings 2012-09-16 22:01:07 +02:00
Nikita Popov
526db7db14 Replace code with zend_clean_and_cache_symbol_table() call 
I replaced other instances of this code with the function call, but missed
this one.
 2012-09-16 21:54:48 +02:00
Nikita Popov
fb03ce93d3 Fix invalid read / remove useless code 
Generators follow a different cleanup path, so the extra check for freeing
the execute_data is unnecessary there. It actually caused problems because
op_array->fn_flags could be in freed memory at that time (in case op_array
came from a closure in an ArrayAccess container).

This fixes the valgrind warning in Zend/tests/bug54367.phpt.
 2012-09-16 21:48:57 +02:00
Stanislav Malyshev
6cc9d99dc2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Respond with 501 to unknown request methods
 2012-09-15 23:11:55 -07:00
Niklas Lindgren
27542db4e7 Respond with 501 to unknown request methods 
Fixed typo

Moved 501 response from dispatch to event_read_request

Return return value of send_error_page
 2012-09-15 23:11:12 -07: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
Stanislav Malyshev
56425ee610 news for bug #61421 2012-09-15 23:02:10 -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
80b29dcfad Merge branch 'PHP-5.4' 2012-09-15 11:51:48 +08:00
Xinchen Hui
ee620e9673 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-15 11:51:25 +08:00
Xinchen Hui
4c6678d605 Fixed bug #63093 (Segfault while load extension failed in zts-build). 2012-09-15 11:50:16 +08:00
Xinchen Hui
d23f9194b1 Merge branch 'PHP-5.4' 2012-09-15 11:33:26 +08:00
Xinchen Hui
7609fb433a Remove bug fixed entry 2012-09-15 11:32:44 +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
Derick Rethans
7101e9161c Merge branch 'PHP-5.4' 2012-09-14 09:38:36 +01:00
Derick Rethans
ab62ffa0a2 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-14 09:38:32 +01:00
Derick Rethans
78354f30d9 - Updated to version 2012.6 (2012f) 2012-09-14 09:38:31 +01: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
30981836fa Merge branch 'bug60901' into PHP-5.3 
* bug60901:
  Change package.xml fix description
  Fixed bug #60901 (Improve "tail" syntax for AIX installation)
 2012-09-13 22:43:37 -07:00