php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-01 05:02:27 +02:00
Code Issues Packages Projects Releases Wiki Activity
76,166 Commits 547 Branches 1,481 Tags
f72ed22749178b9d17455a308cefc523fd85109e
Commit Graph

76166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wallner
f72ed22749 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix bug #64146 (serialize incorrectly saving objects when they are cloned)
 2013-10-04 16:17:46 +02:00
Michael Wallner
d72a4d1634 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #64146 (serialize incorrectly saving objects when they are cloned)
 2013-10-04 16:17:37 +02:00
Michael Wallner
8973390541 fix bug #64146 (serialize incorrectly saving objects when they are 
cloned)
 2013-10-04 16:16:15 +02:00
Michael Wallner
39022ba227 Merge branch 'PHP-5.5' 
* PHP-5.5:
  such a weird hack probably helps in finding regressions in the future
 2013-10-04 16:12:41 +02:00
Michael Wallner
adfb5ab7ce Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  such a weird hack probably helps in finding regressions in the future
 2013-10-04 16:12:23 +02:00
Michael Wallner
e8ae795529 such a weird hack probably helps in finding regressions in the future 2013-10-04 16:11:49 +02:00
Nikita Popov
ff46b6f633 Merge branch 'PHP-5.5' 2013-10-04 13:15:45 +02:00
Nikita Popov
536260f2c5 Fix bug #65821: By-ref foreach on property access of string offset segfaults 
This removes the now unnecessary ZEND_FETCH_ADD_LOCK on the
container of a property fetch of a by-reference foreach.
 2013-10-04 13:13:46 +02:00
Michael Wallner
e13e5b17ff Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #64230 (XMLReader does not suppress errors)
 2013-10-04 11:22:52 +02:00
Michael Wallner
2e2bda3508 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64230 (XMLReader does not suppress errors)
 2013-10-04 11:22:43 +02:00
Michael Wallner
f6ff3a28d6 Fixed bug #64230 (XMLReader does not suppress errors) 2013-10-04 11:22:17 +02:00
Michael Wallner
099b295646 add NEWS and UPGRADING about gost-crypto 2013-10-03 16:23:59 +02:00
Michael Wallner
05f847da45 Merge PR #430 gost-crypto 
Merge branch 'master' of github.com:manuelm/php-src

* 'master' of github.com:manuelm/php-src:
  fix failing tests
  fix indention
  Add support for CryptoPro S-box for GOST
 2013-10-03 16:20:00 +02:00
Michael Wallner
c7b1d76eb9 fix bug #55285 XMLReader::getAttribute/No/Ns methods inconsistency 2013-10-03 15:23:05 +02:00
Michael Wallner
2a1bd123d6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  typo: really fix bug #51936 	Crash with clone xmlreader
 2013-10-03 13:35:09 +02:00
Michael Wallner
92fd085ebf Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typo: really fix bug #51936 	Crash with clone xmlreader
 2013-10-03 13:35:00 +02:00
Michael Wallner
dc3d360a0f typo: really fix bug #51936 Crash with clone xmlreader 2013-10-03 13:34:31 +02:00
Michael Wallner
95fd508dfa Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix bug #59613 (Crash with clone XMLReader)
 2013-10-03 13:30:02 +02:00
Michael Wallner
86f2b33629 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #59613 (Crash with clone XMLReader)
 2013-10-03 13:29:18 +02:00
Michael Wallner
fc3f8a8f54 fix bug #59613 (Crash with clone XMLReader) 2013-10-03 13:28:41 +02:00
Remi Collet
99598fd873 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix Bug #60633 build warning in bcmath
 2013-10-03 08:45:40 +02:00
Remi Collet
60d9175280 Fix Bug #60633 build warning in bcmath 2013-10-03 08:45:31 +02:00
Michael Wallner
bc16dfda1f Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix bug #65808 	the socket_connect() won't work with IPv6 address
  5.4.22-dev now
 2013-10-02 15:56:09 +02:00
Michael Wallner
2ba3926815 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #65808 	the socket_connect() won't work with IPv6 address
  5.4.22-dev now

Conflicts:
	configure.in
	ext/sockets/sockets.c
	main/php_version.h
 2013-10-02 15:55:38 +02:00
Michael Wallner
9209c19f8f fix bug #65808 the socket_connect() won't work with IPv6 address 2013-10-02 15:19:25 +02:00
Stanislav Malyshev
b2f8f35a88 5.4.22-dev now 2013-10-01 22:25:56 -07:00
Christopher Jones
67df40fd54 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Revert "Make 'make distclean' remove the downloaded pear PHAR"
 2013-10-01 10:35:03 -07:00
Christopher Jones
60e38b3243 Revert "Make 'make distclean' remove the downloaded pear PHAR" 
This reverts commit d7baf0427f.
 2013-10-01 10:33:39 -07:00
Christopher Jones
471413ab19 Merge branch 'master' of https://git.php.net/repository/php-src 
# By Michael Wallner (2) and Dmitry Stogov (1)
# Via Michael Wallner (5) and others
* 'master' of https://git.php.net/repository/php-src:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
  Fixed bug #61548
  Reverted patch (it was used for internal testing and was committed by accident)
 2013-10-01 10:19:45 -07:00
Christopher Jones
ec5b87c50d Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
# By Michael Wallner (2) and Dmitry Stogov (1)
# Via Michael Wallner (3) and Christopher Jones (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
  Fixed bug #61548
  Reverted patch (it was used for internal testing and was committed by accident)
 2013-10-01 10:19:40 -07:00
Christopher Jones
33fd0e0b78 Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
# By Michael Wallner
# Via Michael Wallner
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
  Fixed bug #61548
 2013-10-01 10:19:24 -07:00
Michael Wallner
54c08e3e1e Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
 2013-10-01 17:02:20 +02:00
Michael Wallner
4b61203b01 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
 2013-10-01 17:01:44 +02:00
Michael Wallner
cd1cab3f47 fix bug #62396 'make test' crashes starting with 5.3.14 
(missing gzencode())
 2013-10-01 17:01:03 +02:00
Michael Wallner
d29a01de3f Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #61548

Conflicts:
	ext/standard/http_fopen_wrapper.c
 2013-10-01 11:11:48 +02:00
Michael Wallner
ad139d9a00 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #61548
 2013-10-01 11:08:20 +02:00
Michael Wallner
18b04b480e Fixed bug #61548 2013-10-01 11:07:55 +02:00
Dmitry Stogov
66cd9ef04c Merge branch 'PHP-5.5' 
* PHP-5.5:
  Reverted patch (it was used for internal testing and was committed by accident)
 2013-10-01 11:34:19 +04:00
Dmitry Stogov
51fca2b4b3 Reverted patch (it was used for internal testing and was committed by accident) 2013-10-01 11:32:11 +04:00
Christopher Jones
954a0f8bf4 OCI8 2.0: Added a new oci_set_db_operation() user space function for the "DB Operation" tracing feature of Oracle DB 12c. 
Currently this code is #ifdef'd out, since I can't consider the feature stable until an Oracle-side fix for Oracle bug 16695981 is available.  Having the code available in PHP OCI8 facilitates testing of any fix.
 2013-09-30 16:51:07 -07:00
Christopher Jones
ca6a259ed1 Merge branch 'master' of https://git.php.net/repository/php-src 
# By Michael Wallner (2) and others
# Via Christopher Jones (8) and others
* 'master' of https://git.php.net/repository/php-src:
  Make 'make distclean' remove the downloaded pear PHAR
  fix test
  fix memleak on resetting rebind_proc
  Fix bug #64979: Wrong behavior of static variables in closure generators
  Fix bug #65322: compile time errors won't trigger auto loading
  5.5.4 release date
  5.4.20 release date
  Add information about which INI file is which inside respective files
 2013-09-30 15:54:39 -07:00
Christopher Jones
aeb6e9c264 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
# By Michael Wallner (2) and others
# Via Christopher Jones (4) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Make 'make distclean' remove the downloaded pear PHAR
  fix test
  fix memleak on resetting rebind_proc
  Fix bug #64979: Wrong behavior of static variables in closure generators
  Fix bug #65322: compile time errors won't trigger auto loading
  5.5.4 release date
  5.4.20 release date
 2013-09-30 15:54:36 -07:00
Christopher Jones
679bf479b6 Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
# By Michael Wallner (2) and others
# Via Michael Wallner
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  fix test
  fix memleak on resetting rebind_proc
  Fix bug #65322: compile time errors won't trigger auto loading
  5.4.20 release date
 2013-09-30 15:54:34 -07:00
Christopher Jones
86c3378c5c Merge branch 'PHP-5.5' 
* PHP-5.5:
  Make 'make distclean' remove the downloaded pear PHAR
 2013-09-30 15:47:33 -07:00
Christopher Jones
d7baf0427f Make 'make distclean' remove the downloaded pear PHAR 2013-09-30 15:46:22 -07:00
Michael Wallner
6757033355 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix test
  fix memleak on resetting rebind_proc
 2013-09-30 14:05:37 +02:00
Michael Wallner
d4d6a95105 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test
  fix memleak on resetting rebind_proc
 2013-09-30 14:04:48 +02:00
Michael Wallner
2b78edfba2 fix test 2013-09-30 11:41:35 +02:00
Michael Wallner
e9e63f9223 fix memleak on resetting rebind_proc 2013-09-30 11:23:33 +02:00
Nikita Popov
cbf0683c6f Merge branch 'PHP-5.5' 2013-09-29 20:19:40 +02:00