php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 01:18:19 +02:00
Code Issues Packages Projects Releases Wiki Activity
73,251 Commits 549 Branches 1,485 Tags
4c293bfe91c69d69e7bb625165fff601a5d35f4b
Commit Graph

73251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev 4c293bfe91 Merge branch 'PHP-5.5' 
* PHP-5.5:
  news for bug #49348
  fix tests
  fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
 2013-02-21 00:57:52 -08:00
Stanislav Malyshev 76160319a5 news for bug #49348 2013-02-21 00:56:00 -08:00
Stanislav Malyshev d39554ac08 Merge branch 'bug49348' into PHP-5.5 
* bug49348:
  fix tests
  fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
 2013-02-21 00:52:46 -08:00
Dmitry Stogov b7f89bc701 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed external entity loading
 2013-02-20 22:31:52 +04:00
Dmitry Stogov 20c623c9be Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed external entity loading
 2013-02-20 22:30:59 +04:00
Dmitry Stogov c737b89473 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed external entity loading

Conflicts:
	ext/libxml/libxml.c
	ext/libxml/php_libxml.h
 2013-02-20 22:27:41 +04:00
Dmitry Stogov 8e76d0404b Fixed external entity loading 2013-02-20 22:14:59 +04:00
Johannes Schlüter 39fb14acb7 Merge branch 'PHP-5.5' 2013-02-20 11:58:29 +01:00
Johannes Schlüter b157e05f57 Merge branch 'PHP-5.4' into PHP-5.5 2013-02-20 11:58:01 +01:00
Johannes Schlüter 021f57ef0e Merge branch 'PHP-5.3' into PHP-5.4 2013-02-20 11:57:11 +01:00
Johannes Schlüter afc1debb2f 5.3.22 NEWS 2013-02-20 11:56:29 +01:00
David Soria Parra 5a987919d8 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Start new NEWS section for beta1
  News for PHP 5.5.0 Alpha 5
 2013-02-19 19:43:18 +01:00
David Soria Parra 7e5f761e82 Start new NEWS section for beta1 2013-02-19 19:42:27 +01:00
David Soria Parra a4bcc15c3b News for PHP 5.5.0 Alpha 5 2013-02-19 19:41:46 +01:00
David Soria Parra 915c00d42f Merge branch 'PHP-5.5' 
* PHP-5.5:
  News for PHP 5.5.0 Alpha 5
 2013-02-19 19:41:02 +01:00
David Soria Parra c3931bdfb3 News for PHP 5.5.0 Alpha 5 2013-02-19 19:27:37 +01:00
Anatol Belski 15a182a2d0 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix the test for curl 7.29.0+
 2013-02-19 09:05:45 +01:00
Anatol Belski 43664e656d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix the test for curl 7.29.0+
 2013-02-19 09:05:27 +01:00
Anatol Belski cc34dfce16 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix the test for curl 7.29.0+
 2013-02-19 09:04:52 +01:00
Anatol Belski 558c5dbe65 fix the test for curl 7.29.0+ 2013-02-19 09:04:06 +01:00
Stanislav Malyshev dc6f073ce9 fix tests 2013-02-18 23:01:42 -08:00
Stanislav Malyshev 0c6d903ce7 fix bug #49348 - issue notice on get_property_ptr_ptr when used for read 2013-02-18 20:56:02 -08:00
Dmitry Stogov d7cbc01188 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #64070 (Inheritance with Traits failed with error)
 2013-02-18 16:36:25 +04:00
Dmitry Stogov d77eb411ea Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64070 (Inheritance with Traits failed with error)

Conflicts:
	NEWS
	Zend/zend_compile.c
 2013-02-18 16:20:49 +04:00
Dmitry Stogov 42437dd870 Fixed bug #64070 (Inheritance with Traits failed with error) 2013-02-18 16:07:51 +04:00
Gustavo Lopes 427de31aa6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Cleanup some multicast code; fix for mac os x?
 2013-02-17 22:43:28 +01:00
Gustavo Lopes 91538e4e13 Cleanup some multicast code; fix for mac os x? 
When I moved some stuff from sockets.c to multicast.c, I did not copy
some conditional defines for systems without the RFC 3678 API.

I moved such defines to multicast.h so both sockets.c and multicast.c
can benefit from them and I prefixed them with PHP_ so that it's less
confusing: now PHP_MCAST_* are defined to either the MCAST_* RFC 3678
APIs or to legacy APIs and MCAST_* always mean the (possibly undefined)
system definitions.
 2013-02-17 22:42:58 +01:00
Stanislav Malyshev c389d33f0c Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix protos
 2013-02-17 13:34:07 -08:00
Stanislav Malyshev 17c6389e9e fix protos 2013-02-17 13:33:48 -08:00
Stanislav Malyshev 1307c6c197 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey()
 2013-02-17 13:30:04 -08:00
Stanislav Malyshev 0841eca580 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey()
 2013-02-17 13:29:34 -08:00
Stanislav Malyshev 7b0107cc5d fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey() 2013-02-17 13:28:42 -08:00
Anatol Belski 9a85dca7a5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix free vs. curl_free
 2013-02-17 20:29:58 +01:00
Anatol Belski 432d59ab55 fix free vs. curl_free 2013-02-17 20:29:20 +01:00
Stanislav Malyshev 8be9a974da Merge branch 'PHP-5.5' 
* PHP-5.5:
  update NEWS
 2013-02-17 02:38:41 -08:00
Stanislav Malyshev d420368bc9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
 2013-02-17 02:38:25 -08:00
Stanislav Malyshev 92b1cb3ca0 update NEWS 2013-02-17 02:37:58 -08:00
Stanislav Malyshev 5077cde952 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added HTTP codes as of RFC 6585
 2013-02-17 01:20:36 -08:00
Stanislav Malyshev c877fcf6ec Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Added HTTP codes as of RFC 6585
 2013-02-17 01:20:14 -08:00
Jonh Wendell 59b016192d Added HTTP codes as of RFC 6585 
Added descriptions for the new HTTP codes:

- 428 Precondition Required
- 429 Too Many Requests
- 431 Request Header Fields Too Large
- 511 Network Authentication Required
 2013-02-17 01:18:40 -08:00
Xinchen Hui a1b5796c5c Merge branch 'PHP-5.5' 2013-02-17 11:07:07 +08:00
Xinchen Hui d3291de51a Merge branch 'PHP-5.4' into PHP-5.5 2013-02-17 11:06:33 +08:00
Xinchen Hui 263accb626 Merge branch 'PHP-5.3' into PHP-5.4 2013-02-17 11:05:34 +08:00
Xinchen Hui 01ae5c3c2f Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS) 2013-02-17 11:04:36 +08:00
Xinchen Hui c520280381 Merge branch 'PHP-5.5' 2013-02-16 22:30:14 +08:00
Xinchen Hui 69b80a93de Merge branch 'PHP-5.4' into PHP-5.5 2013-02-16 22:29:14 +08:00
Xinchen Hui 375e3c273b Fix test failed after 0ea83ff847 2013-02-16 22:28:28 +08:00
Xinchen Hui 92046b7ef1 Merge branch 'PHP-5.5' 2013-02-16 22:25:37 +08:00
Xinchen Hui 75742d57eb Exceptions triggered by undefined variable should be handled before FATAL error 
this is a enhancement of the fix for bug #64135
 2013-02-16 22:22:22 +08:00
Boris Lytochkin cddc9f598b Fixed bug #64124 (IPv6 malformed) 2013-02-14 23:12:53 +04:00