Dmitry Stogov
7b113d789d
PHAR should modify entry timestamp when it's modified
2013-02-21 15:55:20 +04:00
Sara Golemon
ead2e1708d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
http-stream test requires network connectivity
2013-02-21 03:22:09 -08:00
Sara Golemon
c16d6befd4
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
http-stream test requires network connectivity
2013-02-21 03:21:49 -08:00
Sara Golemon
bc55a8eb9f
http-stream test requires network connectivity
2013-02-21 03:21:23 -08:00
Xinchen Hui
f39d12c821
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-21 18:20:48 +08:00
Xinchen Hui
9a44a9806c
Fixed bug #64235 (Insteadof not work for class method in 5.4.11)
...
As we discussed with stefan, we think previous of allowing use with
classes is a bug, should be forbided, anyway, the error message should
be improved.
2013-02-21 18:18:41 +08:00
Anatol Belski
22ae9efe6e
added back the older vc9 favours
2013-02-21 10:59:50 +01:00
Anatol Belski
27f8944eaa
updated lib versions
2013-02-21 10:32:56 +01:00
Anatol Belski
5ec06a1e5a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated lib versions
updated lib versions
2013-02-21 10:29:55 +01:00
Anatol Belski
bae95bd9d4
updated lib versions
2013-02-21 10:27:37 +01:00
Anatol Belski
07a13fd9fa
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
updated lib versions
2013-02-21 10:26:38 +01: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
Anatol Belski
81e9aa6c8d
updated lib versions
2013-02-21 09:46:50 +01: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
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
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
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
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
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
17c6389e9e
fix protos
2013-02-17 13:33:48 -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
432d59ab55
fix free vs. curl_free
2013-02-17 20:29:20 +01: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
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
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
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
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
Boris Lytochkin
68fa6a3eb7
+Fixed bug #64124 (IPv6 malformed). (Boris Lytochkin)
2013-02-14 23:08:08 +04:00
Dmitry Stogov
1bde2b4fc9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Proper bit reset code
2013-02-13 22:07:57 +04:00
Dmitry Stogov
4b900f4831
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Proper bit reset code
2013-02-13 22:07:21 +04:00
Dmitry Stogov
188c196d4d
Proper bit reset code
2013-02-13 22:06:37 +04:00
Ard Biesheuvel
65fa9f2c4b
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-13 13:50:53 +01:00
