clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,556 Commits 493 Branches 1,365 Tags 848 MiB
cde53e7fcd
Commit Graph

72556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rasmus Lerdorf
d5fe89670e Merge branch 'PHP-5.4' into PHP-5.5 2012-12-19 23:00:41 -05:00
Rasmus Lerdorf
180b9e150b Fix for bug #63811 2012-12-19 22:58:18 -05:00
Pierrick Charron
aa9156d7e0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #55438 (Curlwapper is not sending http header randomly)
 2012-12-19 19:46:57 -05:00
Pierrick Charron
66b88c92bb Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #55438 (Curlwapper is not sending http header randomly)
 2012-12-19 19:44:08 -05:00
Pierrick Charron
c46e1cdcae Fixed bug #55438 (Curlwapper is not sending http header randomly) 
Since curl multi is used, it sometime happen that the resource is freed before
the curl multi really execute the query. The patch will store the headers
slist in the curlstream handle and free it only when the stream will be closed
 2012-12-19 19:40:29 -05:00
Johannes Schlüter
1ee8c3d9a2 Merge branch 'PHP-5.4' into PHP-5.5 2012-12-19 17:01:44 +01:00
Andrey Hristov
ec012c1b75 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/mysqlnd/mysqlnd_alloc.c
 2012-12-19 16:58:34 +01:00
Johannes Schlüter
59692de77f Merge branch 'PHP-5.3' into PHP-5.4 2012-12-19 16:17:18 +01:00
Johannes Schlüter
e01fe5315c Update release date 2012-12-19 16:15:39 +01:00
Nikita Popov
2768315856 Add missing zend_do_free call 
This is a followup to d53f1bf8ab. When the yield *statement* is used its
return value still needs to be freed.
 2012-12-19 15:21:34 +01:00
Andrey Hristov
ae9ba081c8 Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4 2012-12-19 15:08:09 +01:00
Remi Collet
828bb4d44d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix failing test on Linux build
 2012-12-19 10:25:05 +01:00
Remi Collet
3732fa95c5 fix failing test on Linux build 2012-12-19 10:23:57 +01:00
Nikita Popov
d53f1bf8ab Fix leak when generator ignores sent value 
When the return value of yield wasn't used it was leaked.

This is fixed by using a TMP_VAR return value instead of VAR. TMP_VARs are
automatically freed when they aren't used.
 2012-12-18 21:39:02 +01:00
David Soria Parra
19f8bba10d News for PHP 5.5.0 Alphas 2012-12-18 16:51:04 +01:00
Andrey Hristov
1f7c46b579 be cautious about the result of strrchr 2012-12-18 16:21:05 +01:00
Xinchen Hui
ea649a5aba Merge branch 'PHP-5.4' into PHP-5.5 2012-12-17 14:30:20 +08:00
Xinchen Hui
05deaf1706 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-17 14:29:45 +08:00
Xinchen Hui
06739a1b72 dos2unix & skip on connect fail 2012-12-17 14:29:13 +08:00
Xinchen Hui
ea5132866f Merge branch 'PHP-5.4' into PHP-5.5 2012-12-17 12:58:12 +08:00
Xinchen Hui
2f7f57a407 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-17 12:57:37 +08:00
Xinchen Hui
d2cc097049 Fix failed test 2012-12-17 12:56:55 +08:00
Sebastian Bergmann
67a7a66466 Ignore Zend/zend_dtrace_gen.h and Zend/zend_dtrace_gen.hbak 2012-12-16 09:07:55 +01:00
Remi Collet
717b367085 Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17 2012-12-16 08:51:17 +01:00
Lars Strojny
36a5eca89c Updating news entry to list new filetypes 2012-12-15 12:00:42 +01:00
Lars Strojny
aaa5e42177 Merge branch 'PHP-5.4' into PHP-5.5 2012-12-14 14:56:25 +01:00
Lars Strojny
c3b480323f News entry for updated mime types 2012-12-14 14:54:38 +01:00
pascalc
d813af0618 update test for supported Mime Types checking 2012-12-14 13:59:06 +01:00
pascalc
e5b1ebc082 update list of common Mime Types in PHP development server to support Web audio/video formats (Webm ,and Ogg containers) + have jpeg mime types listed together 2012-12-14 13:59:01 +01:00
Xinchen Hui
a73a6be764 Fix warning of no return in non-void function 2012-12-14 17:26:42 +08:00
Xinchen Hui
9fb5cfdeb1 Fixed warning of no return in non-void funciton 2012-12-14 17:21:43 +08:00
Xinchen Hui
359d91a807 Add test for bug #63741 2012-12-14 16:52:56 +08:00
Dmitry Stogov
e65b966aac Fixed uninitialized EX(call)->called_scope 2012-12-14 12:10:29 +04:00
Rasmus Lerdorf
5aabf243bf Merge branch 'PHP-5.4' into PHP-5.5 2012-12-13 16:54:44 -08:00
Rasmus Lerdorf
77c4b84ac8 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-13 16:54:31 -08:00
Rasmus Lerdorf
7a49e09fd8 Need connect.inc here 2012-12-13 16:54:16 -08:00
Rasmus Lerdorf
3925683d46 Merge branch 'PHP-5.4' into PHP-5.5 2012-12-13 16:42:50 -08:00
Rasmus Lerdorf
d845549257 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-13 16:42:33 -08:00
Rasmus Lerdorf
9d1bc1b622 Fix broken test 
Need to use the configured connection parameters here. We can't assume
the test user has access.
 2012-12-13 16:41:56 -08:00
Rasmus Lerdorf
17b803d448 Merge branch 'PHP-5.4' into PHP-5.5 2012-12-13 16:17:34 -08:00
Rasmus Lerdorf
538d8338c0 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-13 16:15:06 -08:00
Rasmus Lerdorf
eecdb4c254 Fix broken test 
This was missing a %s for the path here
 2012-12-13 16:13:37 -08:00
Arpad Ray
61bf1f4ee6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #63379 - Don't reset mod_user_is_open in destroy
 2012-12-13 23:59:34 +00:00
Arpad Ray
6566ea6173 Fix #63379 - Don't reset mod_user_is_open in destroy 
The parent handler is still open so the reset here was in error.
 2012-12-13 23:51:43 +00:00
Johannes Schlüter
2098cc7e9d Merge branch 'PHP-5.4' into PHP-5.5 2012-12-13 22:45:47 +01:00
Johannes Schlüter
ef37055c34 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-13 22:40:23 +01:00
Johannes Schlüter
a11606b18f Fix Bug #63762 Sigsegv when Exception::$trace is changed by user 2012-12-13 22:39:35 +01:00
Anatoliy Belsky
bef54e5365 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed mysqlnd compilation in debug mode on windows
 2012-12-13 15:05:35 +01:00
Anatoliy Belsky
0d458ae89f Fixed mysqlnd compilation in debug mode on windows 2012-12-13 15:01:01 +01:00
Dmitry Stogov
d5c2da5756 Removed unreachable code 2012-12-13 17:51:04 +04:00