php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-03 22:22:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
72,901 Commits 547 Branches 1,481 Tags
d39554ac08ef4a2db4a67aeca08334cb02ff3b47
Commit Graph

72901 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ard Biesheuvel
050aae2860 Fixed bug #64197 (_Offsetof() macro used but not defined on ARM/Clang) 
Updated the code to test for __ARMCC_VERSION instead of __arm, as
that is a more reliable indicator of whether the ARMCC compiler is
being used.
 2013-02-13 12:22:50 +01:00
Ard Biesheuvel
d1ad926aa4 Update config.sub/config.guess to latest GPLv2 upstream version 
This adds the ability to configure/build for/on 64-bit ARMv8,
which uses the host triplet 'aarch64-linux-gnu'.

Source:
  http://git.savannah.gnu.org/gitweb/?p=config.git;h=306afce
 2013-02-11 17:53:30 +01:00
Ard Biesheuvel
dbad4fb3ad NEWS update 2013-02-11 15:54:59 +01:00
Ard Biesheuvel
e2453276e9 Low-level ARM optimizations 
- added ARM versions of zend_mm_high_bit()/zend_mm_low_bit()
- improved safe_address()
 2013-02-11 14:36:58 +01:00
Ard Biesheuvel
aa12cdc361 Improve x86 inline assembler 
- added cc annotation to inline asm that clobbers the condition
  flags
- remove hardcoded constants (IS_LONG,IS_DOUBLE)
- remove hardcoded offsets (zval->value, zval->type)
 2013-02-11 13:53:27 +01:00
Andrey Hristov
5bfdf4f069 build fixes 2013-02-11 12:07:10 +01:00
Remi Collet
1a954ea616 NEWS 2013-02-11 09:13:52 +01:00
Remi Collet
dc47ec0490 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64142 (dval to lval different behavior on ppc64)
 2013-02-11 09:13:27 +01:00
Remi Collet
e67a2b9e47 Fixed bug #64142 (dval to lval different behavior on ppc64) 
See discussion on internals
http://marc.info/?t=136042277700003&r=1&w=2
 2013-02-11 09:10:51 +01:00
Stanislav Malyshev
ce005c0883 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
  mb_split() can now handle empty matches like preg_split() does.
 2013-02-09 23:05:35 -08:00
Stanislav Malyshev
bfdb889d4f update NEWS 2013-02-09 23:02:26 -08:00
Moriyoshi Koizumi
20eb33b321 mb_split() can now handle empty matches like preg_split() does. 2013-02-10 15:05:17 +09:00
Moriyoshi Koizumi
0ea83ff847 mb_split() can now handle empty matches like preg_split() does. 2013-02-10 15:04:23 +09:00