clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 23:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,025 Commits 494 Branches 1,367 Tags 809 MiB
a441d9274b
Commit Graph

32093 Commits

Author SHA1 Message Date
Xinchen Hui
a441d9274b Merge branch 'PHP-5.5' 2013-06-27 12:38:52 +08:00
Xinchen Hui
c2cfc242c4 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-27 12:38:13 +08:00
Xinchen Hui
fa8611c81e Fixed bug #65136 (RecursiveDirectoryIterator segfault) 2013-06-27 12:37:57 +08:00
Felipe Pena
86a54638ed Merge branch 'PHP-5.5' 
* PHP-5.5:
  - BFN
  - Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
  - Reclassify bug
 2013-06-26 19:16:37 -03:00
Felipe Pena
402b3aaf56 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - BFN
  - Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
  - Reclassify bug
 2013-06-26 19:16:26 -03:00
Felipe Pena
60dcc5851f - Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com 2013-06-26 19:15:19 -03:00
Felipe Pena
c6a218c76b Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
 2013-06-26 13:50:47 -03:00
Felipe Pena
aa31d7e1ef Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
 2013-06-26 13:50:43 -03:00
Felipe Pena
7e33b5d2fa - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com 2013-06-26 13:50:37 -03:00
Felipe Pena
c743d0c9dc Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed test
 2013-06-26 13:36:50 -03:00
Felipe Pena
32f11e4ee6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed test
 2013-06-26 13:36:41 -03:00
Felipe Pena
f477ad22c2 - Fixed test 2013-06-26 13:36:36 -03:00
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
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
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
4289696828 - Fixed bug #62475 (variant_* functions causes crash when null given as an argument) 2013-06-25 21:36:50 -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
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
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
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
9d9ec2a90e Merge branch 'PHP-5.4' into PHP-5.5 2013-06-25 13:38:50 +08:00
Xinchen Hui
38eb909d06 Fixed Bug #61828 (Memleak when calling Directory(Recursive)Iterator/Spl(Temp)FileObject ctor twice) 2013-06-25 13:38:27 +08:00
Felipe Pena
ba3278d9e6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
  - BFN
 2013-06-24 16:50:19 -03:00
Felipe Pena
ff292d619c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
  - BFN
 2013-06-24 16:49:22 -03:00
Felipe Pena
982c11573d - Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com 2013-06-24 16:49:15 -03:00
Felipe Pena
33472f78f9 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch
 2013-06-24 14:48:28 -03:00
Felipe Pena
4b41959f9e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch
 2013-06-24 14:47:40 -03:00
Felipe Pena
8776555d7a - Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch 2013-06-24 14:43:35 -03:00
Remi Collet
8e4e38aaee Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix imagecreatefromwebp and imagewebp protos
 2013-06-24 11:15:56 +02:00
Remi Collet
9da4985bf2 fix imagecreatefromwebp and imagewebp protos 2013-06-24 11:15:50 +02:00
Remi Collet
8c694401bb Merge branch 'PHP-5.5' 
* PHP-5.5:
  Use same logic to load WebP image that other formats
 2013-06-24 11:11:02 +02:00
Remi Collet
8075f1f4a3 Use same logic to load WebP image that other formats 2013-06-24 11:10:52 +02:00