clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,664 Commits 494 Branches 1,367 Tags 802 MiB
e09e45eb86
Commit Graph

76664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Hristov
e09e45eb86 Merge branch 'PHP-5.5' 2013-11-21 21:30:36 +02:00
Andrey Hristov
763f4aef8b Merge branch 'PHP-5.4' into PHP-5.5 2013-11-21 21:29:37 +02:00
Andrey Hristov
ce09822269 And here is the real fix for #66124 2013-11-21 21:29:21 +02:00
Andrey Hristov
c2b2afacc0 Merge branch 'PHP-5.4' into PHP-5.5 2013-11-21 21:15:22 +02:00
Andrey Hristov
4a1c9be857 Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i') 2013-11-21 21:14:42 +02:00
Anatol Belski
6f2d32fd1f Merge branch 'PHP-5.6' 
* PHP-5.6:
  permanently deactivate that place, not on runtime only
 2013-11-20 10:12:29 +01:00
Anatol Belski
c694d1df7b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  permanently deactivate that place, not on runtime only
 2013-11-20 10:12:06 +01:00
Anatol Belski
18b2b2a0bc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  permanently deactivate that place, not on runtime only
 2013-11-20 10:11:39 +01:00
Anatol Belski
b902a25cc3 permanently deactivate that place, not on runtime only 
besides the two "if" checks, this fixes static analyze which is sometimes
broken because of this
 2013-11-20 10:09:11 +01:00
Yasuo Ohgaki
bccead024d Merge branch 'PHP-5.6' 
* PHP-5.6:
  added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
 2013-11-20 07:25:45 +09:00
Yasuo Ohgaki
bf91f101a6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
 2013-11-20 07:25:04 +09:00
Yasuo Ohgaki
b8b92bd790 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
 2013-11-20 07:23:54 +09:00
Yasuo Ohgaki
0d558afc05 Fix WS in serialization_error_002.phpt 2013-11-20 07:17:53 +09:00
Aaron Hamid
050dd59c63 added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean 2013-11-20 07:14:53 +09:00
Jeff Welch
b2ca20312d Fixed tests that fail with non-default serialize_precision configurations. 
See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
 2013-11-20 06:17:57 +09:00
Jeff Welch
72a8489a12 Fixed tests that fail with non-default serialize_precision configurations. 
See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
 2013-11-20 06:17:34 +09:00
Jeff Welch
101c780500 Fixed tests that fail with non-default serialize_precision configurations. 
See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
 2013-11-20 06:17:23 +09:00
Jeff Welch
b4210efe76 Fixed tests that fail with non-default serialize_precision configurations. 
See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
 2013-11-20 06:14:32 +09:00
Remi Collet
b41a2755c4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  avoid doing a stream_select on a closed stream
 2013-11-19 12:43:00 +01:00
Remi Collet
8c05e861d6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  avoid doing a stream_select on a closed stream
 2013-11-19 12:42:44 +01:00
Remi Collet
87cabc04ac Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  avoid doing a stream_select on a closed stream
 2013-11-19 12:42:25 +01:00
Remi Collet
25c08a839a avoid doing a stream_select on a closed stream 2013-11-19 12:41:58 +01:00
Andrea Faulds
e68792dbb2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS
  Removed UPGRADING note
  Rewrote test using tcp instead of http:// stream
  Implemented FR #65917 (getallheaders() is not supported by the built-in...)
 2013-11-18 21:54:00 +00:00
Andrea Faulds
35b463a2c5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
  Removed UPGRADING note
  Rewrote test using tcp instead of http:// stream
  Implemented FR #65917 (getallheaders() is not supported by the built-in...)
 2013-11-18 21:43:59 +00:00
Andrea Faulds
e3528f086a Updated NEWS 2013-11-18 21:23:45 +00:00
Andrea Faulds
9937e2fda5 Merge branch 'CLIGetAllHeadersBackport' into PHP-5.5 
* CLIGetAllHeadersBackport:
  Removed UPGRADING note
  Rewrote test using tcp instead of http:// stream
  Implemented FR #65917 (getallheaders() is not supported by the built-in...)
 2013-11-18 21:19:07 +00:00
kovacs.ferenc
a833f7d460 Merge branch 'PHP-5.6' 2013-11-18 12:39:40 +01:00
kovacs.ferenc
2042d78fce Merge branch 'JSONCaseFix' of git://github.com/TazeTSchnitzel/php-src into TazeTSchnitzel-JSONCaseFix 2013-11-18 12:12:24 +01:00
Kalle Sommer Nielsen
9e3551ba1f Eliminated the TSRMLS_FETCH() in zend_set_memory_limit() 2013-11-18 01:36:17 +01:00
krakjoe
f046189e34 export more Zend API 2013-11-17 22:39:31 +00:00
Xinchen Hui
b93f8e6277 Merge branch 'PHP-5.6' 2013-11-17 17:20:27 +08:00
Xinchen Hui
140a42f779 Merge branch 'PHP-5.5' into PHP-5.6 2013-11-17 17:20:13 +08:00
Xinchen Hui
5a282136a3 Merge branch 'PHP-5.5' 2013-11-17 17:11:20 +08:00
Xinchen Hui
5e9268f469 Update NEWS 2013-11-17 17:06:27 +08:00
Xinchen Hui
de79c51555 Merge branch 'PHP-5.4' into PHP-5.5 2013-11-17 17:05:04 +08:00
Xinchen Hui
823e330c75 Fixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string) 2013-11-17 17:04:37 +08:00
Christopher Jones
3e4e173296 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Update NEWS
  This is CLI web server change.  Added some common MIME types to the existing lookup list, pending a more thorough lookup solution, if anyone wants to do that.  Ref http://news.php.net/php.internals/69990
 2013-11-15 12:38:18 -08:00
Christopher Jones
81d0ba10ba Update NEWS 2013-11-15 12:37:52 -08:00
Christopher Jones
419bef3070 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  This is CLI web server change.  Added some common MIME types to the existing lookup list, pending a more thorough lookup solution, if anyone wants to do that.  Ref http://news.php.net/php.internals/69990
 2013-11-15 12:37:17 -08:00
Christopher Jones
d0cd112702 This is CLI web server change. Added some common MIME types to the 
existing lookup list, pending a more thorough lookup solution, if
anyone wants to do that.  Ref http://news.php.net/php.internals/69990

A router can be used to add to, or override, the MIME type lookups,
see http://php.net/manual/en/features.commandline.webserver.php
 2013-11-15 12:36:25 -08:00
Remi Collet
a37ff1fa4b Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fix Bug #65714 	PHP cli forces the tty to cooked mode
 2013-11-15 09:53:23 +01:00
Remi Collet
4508a84d0d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fix Bug #65714 	PHP cli forces the tty to cooked mode
 2013-11-15 09:53:07 +01:00
Remi Collet
cd6eda5e5f NEWS 2013-11-15 09:52:48 +01:00
Remi Collet
b8d88bf2c5 Fix Bug #65714 PHP cli forces the tty to cooked mode 
Only drop the using_history() call with libedit as I don't know
if it is required with readline.

This also allow to run a php script in background without
it being aborted on first output.
 2013-11-15 09:49:42 +01:00
Adam Harvey
6cf46f49e3 Merge branch 'PHP-5.6' 2013-11-14 10:53:02 -08:00
Adam Harvey
3683713b2c Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	NEWS
 2013-11-14 10:52:43 -08:00
Adam Harvey
d7441f6695 Move the JSON bugfix into the 5.5.6 changelog. 2013-11-14 10:52:07 -08:00
Andrea Faulds
7d2609b0f5 Removed UPGRADING note 
Conflicts:
	UPGRADING
 2013-11-13 17:05:02 +00:00
Remi Collet
b6f76adef4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix failed test with recent glibc
  5.5.7 now
 2013-11-13 13:21:28 +01:00
Remi Collet
74ab30e216 fix merge 2013-11-13 13:21:12 +01:00