clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-27 12:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,874 Commits 494 Branches 1,367 Tags 781 MiB
5eb8d9d700
Commit Graph

76874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
krakjoe
a0e3cb08e6 Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2013-11-20 16:26:21 +00:00
krakjoe
1a1e83a5d9 export more Zend API 2013-11-20 16:24:22 +00: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
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
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
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
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
2042d78fce Merge branch 'JSONCaseFix' of git://github.com/TazeTSchnitzel/php-src into TazeTSchnitzel-JSONCaseFix 2013-11-18 12:12:24 +01:00
Xinchen Hui
140a42f779 Merge branch 'PHP-5.5' into PHP-5.6 2013-11-17 17:20:13 +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
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
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
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
74ab30e216 fix merge 2013-11-13 13:21:12 +01:00
Remi Collet
018b9445da Fix failed test with recent glibc 
In recent version of strptime glibc upstream has fixed a discrepancy between
documentation and actual behaviour by skipping over the sequence that would match %Z.
See ddc7e412ab

So when %Z is used in format
glibc <= 2.18 returns the GMT as unparsed
glibc >= 2.19 returns empty string

Removing %Z from tested format gives the same behavior with all version.
 2013-11-13 13:19:10 +01:00
Nikita Popov
dc4bf922d9 Allow $num=0 in array_fill() 
Implemented request #49824.
 2013-11-12 22:02:51 +01:00
Andrea Faulds
a3f5b9f62d Rewrote test using tcp instead of http:// stream 2013-11-12 20:27:38 +00:00
Andrea Faulds
aee271ec0d Implemented FR #65917 (getallheaders() is not supported by the built-in...) 
- Implemented apache_request_headers() and getallheaders() alias in CLI server
- Implemented apache_response_headers() in CLI server using FastCGI code

Conflicts:
	NEWS
	UPGRADING
 2013-11-12 20:27:34 +00:00
Julien Pauli
1984919ddc 5.5.7 now 2013-11-12 18:20:09 +01:00
Andrea Faulds
91779db95b Fixed case part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly") 2013-11-11 22:54:16 +00:00
Adam Harvey
1205a6c7dc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS and remove the unnecessary UPGRADING note.
  UPGRADING and NEWS
  Better test: Check combined leading/trailing
  Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
 2013-11-10 16:15:12 -05:00
Adam Harvey
304bff90f4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS and remove the unnecessary UPGRADING note.
  UPGRADING and NEWS
  Better test: Check combined leading/trailing
  Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
 2013-11-10 16:11:28 -05:00
Adam Harvey
c9cfd98bcd Update NEWS and remove the unnecessary UPGRADING note. 2013-11-10 15:46:31 -05:00
Adam Harvey
288e9c6423 Merge remote-tracking branch 'ajf/JSONWhitespaceFix' into PHP-5.4 2013-11-10 15:43:56 -05:00
Remi Collet
6997b8793d missing 'config.h' in 5dc37b3 2013-11-10 07:10:36 +01:00
Igor Wiedler
611da37617 use ZVAL_ZVAL to init ZVAL from ZVAL 2013-11-09 13:48:23 -05:00
Rasmus Lerdorf
6713f9c4b2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix broken test
 2013-11-09 09:46:55 -08:00
Rasmus Lerdorf
df7321359e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix broken test
 2013-11-09 09:46:43 -08:00
Rasmus Lerdorf
064ba179b1 Fix broken test 2013-11-09 09:45:52 -08:00
Igor Wiedler
eb063e0075 Merge remote-tracking branch 'lgnome/use-function' into use-function 
* lgnome/use-function:
  Only check user functions for filenames.
 2013-11-08 21:50:04 -05:00