clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 07:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,060 Commits 494 Branches 1,367 Tags 810 MiB
c6a7549efc
Commit Graph

75060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Hristov
793694b9d8 Merge branch 'PHP-5.5' 2013-06-26 16:51:42 +02:00
Andrey Hristov
781be5f1d7 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-06-26 16:50:08 +02:00
Andrey Hristov
b34e8d2e3e add new test 2013-06-26 16:44:26 +02:00
Yasuo Ohgaki
8922c50ca4 Update NEWS 2013-06-26 16:31:34 +09:00
Yasuo Ohgaki
eeeb7a281a Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
 2013-06-26 16:23:25 +09:00
Yasuo Ohgaki
6be36cc381 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
 2013-06-26 16:19:31 +09:00
Yasuo Ohgaki
6c8cef3ca4 Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net 2013-06-26 16:17:57 +09:00
Felipe Pena
802a25e0c9 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed typo on condition
 2013-06-25 21:53:42 -03:00
Felipe Pena
623386d799 - Fixed typo on condition 2013-06-25 21:53:20 -03:00
Felipe Pena
0c7cf58092 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - BFN
 2013-06-25 21:44:17 -03:00
Felipe Pena
b68c496175 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - BFN
 2013-06-25 21:44:03 -03:00
Felipe Pena
12b75e3d3e - BFN 2013-06-25 21:43:23 -03:00
Felipe Pena
509e89448e Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
  Update NEWS
  Update NEWS
  - BFN
 2013-06-25 21:40:30 -03:00
Felipe Pena
fba44be828 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
  Update NEWS
  - BFN
 2013-06-25 21:40:24 -03:00
Felipe Pena
e15ca39708 Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 2013-06-25 21:39:17 -03:00
Felipe Pena
4289696828 - Fixed bug #62475 (variant_* functions causes crash when null given as an argument) 2013-06-25 21:36:50 -03:00
Christopher Jones
91bd2de85c Update NEWS 2013-06-25 17:31:13 -07:00
Christopher Jones
12fdf8fb95 Update NEWS 2013-06-25 17:30:21 -07:00
Christopher Jones
d1bed34b76 Merge branch 'master' of https://git.php.net/repository/php-src 
# By Felipe Pena
# Via Felipe Pena (8) and Christopher Jones (3)
* 'master' of https://git.php.net/repository/php-src:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
 2013-06-25 17:28:27 -07:00
Christopher Jones
99ab8a83af Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
 2013-06-25 17:28:12 -07:00
Christopher Jones
111b385afe Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  - BFN
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
 2013-06-25 17:28:11 -07:00
Felipe Pena
a689fde2bf - BFN 2013-06-25 21:19:56 -03:00
Felipe Pena
83bc4fb40a Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
 2013-06-25 21:19:06 -03:00
Felipe Pena
f5bf90ef34 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
 2013-06-25 21:18:34 -03:00
Felipe Pena
04db57066d - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com 2013-06-25 21:18:09 -03:00
Felipe Pena
40c3601947 - BFN 2013-06-25 18:04:25 -03:00
Felipe Pena
2ab53f4b5e Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 2013-06-25 18:01:46 -03:00
Felipe Pena
b78f129a4a Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5 2013-06-25 18:01:40 -03:00
Felipe Pena
bce86874f6 Merge branch 'master' of git.php.net:/php-src 2013-06-25 18:01:32 -03:00
Felipe Pena
f0823ac493 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
  - BFN
 2013-06-25 18:00:47 -03:00
Felipe Pena
adb116dd48 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
  - BFN
 2013-06-25 18:00:42 -03:00
Felipe Pena
41b73e4cee - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com 2013-06-25 18:00:33 -03:00
Christopher Jones
92c87b02a9 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - BFN
 2013-06-25 13:25:19 -07:00
Christopher Jones
c3f4cc2e40 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - BFN
 2013-06-25 13:25:04 -07:00
Christopher Jones
2d654dc337 Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
 2013-06-25 13:23:58 -07:00
Christopher Jones
3675b953f6 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
 2013-06-25 13:23:50 -07:00
Christopher Jones
5d0094e5f9 Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  - BFN
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
 2013-06-25 13:23:25 -07:00
Felipe Pena
5ae1983b33 - BFN 2013-06-25 16:27:30 -03:00
Felipe Pena
5c71d4d785 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
 2013-06-25 16:26:48 -03:00
Felipe Pena
d01ca1342c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
 2013-06-25 16:26:36 -03:00
Felipe Pena
6ba93a4bae - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana 2013-06-25 16:26:26 -03:00
Christopher Jones
53ec065077 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)
 2013-06-25 12:00:56 -07:00
Christopher Jones
ec7ac71b52 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)
 2013-06-25 12:00:24 -07:00
Christopher Jones
a52258ae17 Merge branch 'configure12c' into PHP-5.4 
* configure12c:
  Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)
 2013-06-25 12:00:08 -07:00
Christopher Jones
423b132a7a Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. 
(note OCI8 already builds with Oracle Database 12c)
 2013-06-25 11:55:41 -07:00
Xinchen Hui
d99a76ca96 Merge branch 'PHP-5.5' 2013-06-25 13:48:54 +08:00
Xinchen Hui
157ccaf507 Fixed bug #64827 Segfault in zval_mark_grey (zend_gc.c) 
I can not get a reproduce script since the context is very strict.

Of course I will try to make one, but for now, I just commit this first.
 2013-06-25 13:47:50 +08:00
Xinchen Hui
d8374c5590 Merge branch 'PHP-5.5' 2013-06-25 13:40:19 +08:00
Xinchen Hui
efd3c72de3 Update NEWS 2013-06-25 13:39:31 +08:00
Xinchen Hui
9d9ec2a90e Merge branch 'PHP-5.4' into PHP-5.5 2013-06-25 13:38:50 +08:00