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
79,184 Commits 494 Branches 1,367 Tags 802 MiB
8f5a31ff37
Commit Graph

79184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yasuo Ohgaki
8f5a31ff37 Add default_charset handling 2014-03-20 11:03:02 +09:00
Christopher Jones
122c69a0be Merge branch 'PHP-5.6' 
* PHP-5.6:
  OCI8: fix prototypes for oci_field_*().  They can take a column index or name.
 2014-03-19 15:23:40 -07:00
Christopher Jones
014c5706a8 Merge branch 'oci_field_doc_prototype_fixes' into PHP-5.6 
* oci_field_doc_prototype_fixes:
  OCI8: fix prototypes for oci_field_*().  They can take a column index or name.
 2014-03-19 15:23:07 -07:00
Christopher Jones
6c20b07190 OCI8: fix prototypes for oci_field_*(). They can take a column index or name. 2014-03-19 15:20:40 -07:00
Christopher Jones
3406f98439 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Change test package name ARRAYBINDPKG1 to a per-file unique name to aid parallel testing
 2014-03-19 14:13:40 -07:00
Christopher Jones
8bdf272758 Change test package name ARRAYBINDPKG1 to a per-file unique name to aid parallel testing 2014-03-19 14:10:56 -07:00
Andrey Hristov
d22d1035cb Merge branch 'PHP-5.6' 2014-03-19 19:15:15 +02:00
Andrey Hristov
62ab3af12f fix compilation error 2014-03-19 19:15:04 +02:00
Andrey Hristov
e756f417b9 Merge branch 'PHP-5.6' 2014-03-19 18:55:40 +02:00
Andrey Hristov
b86595a37c Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	NEWS
 2014-03-19 18:55:29 +02:00
Andrey Hristov
44fb74fad1 fix typo 2014-03-19 18:54:56 +02:00
Andrey Hristov
01c2ec03bc Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	NEWS
	configure.in
	ext/mysqli/mysqli_api.c
	main/php_version.h
 2014-03-19 18:54:39 +02:00
Andrey Hristov
d63ed101ee Fix problem with mysqli_commt()/mysqli_rollback() 2014-03-19 18:32:19 +02:00
Adam Harvey
4bac43a520 Merge branch 'PHP-5.6' 2014-03-19 06:25:06 -07:00
Adam Harvey
d613b0acc2 Restore NEWS and UPGRADING for hash_equals(). 2014-03-19 06:24:01 -07:00
Julien Pauli
c4145619be 5.5.11RC1 preparation 2014-03-19 10:43:32 +01:00
Yasuo Ohgaki
dc471acafe Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding
 2014-03-19 18:14:32 +09:00
Yasuo Ohgaki
3ce980cf97 Merge branch 'pull-request/622' into PHP-5.6 
* pull-request/622:
  Fixed typo
  Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding
 2014-03-19 17:29:24 +09:00
Yasuo Ohgaki
babaa43762 Fixed typo 2014-03-19 17:25:45 +09:00
Stanislav Malyshev
2833c3b77d Merge branch 'PHP-5.6' 
* PHP-5.6:
  prep for 5.4.27 rc1
 2014-03-18 23:25:32 -07:00
Stanislav Malyshev
c1765d7ffe Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  prep for 5.4.27 rc1
 2014-03-18 23:25:08 -07:00
Stanislav Malyshev
1ff28cd0ec Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  prep for 5.4.27 rc1

Conflicts:
	configure.in
	main/php_version.h
 2014-03-18 23:24:09 -07:00
Stanislav Malyshev
9b88bc494e prep for 5.4.27 rc1 2014-03-18 23:19:09 -07:00
Anatol Belski
6d6cce0f56 Merge branch 'PHP-5.6' 
* PHP-5.6:
  remove obsolete comment
  Fixes to various stream cast on win64
 2014-03-19 06:38:18 +01:00
Anatol Belski
ec11530620 remove obsolete comment 2014-03-19 06:35:58 +01:00
Anatol Belski
62f6c5853f Fixes to various stream cast on win64 
This fixes further issues on win64 with casts from the streams.
Sockets/descriptors handling was unitized. This has an impact only on
win64, php_socket_t otherwise can be feed back to int datatype.
 2014-03-19 06:33:46 +01:00
Adam Harvey
68e479b94d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add hash_equals() to perform string comparisons that are not vulnerable to timing attacks.
 2014-03-18 09:33:22 -07:00
Adam Harvey
a6f7fca637 Merge accepted RFC https://wiki.php.net/rfc/timing_attack into 5.6. 2014-03-18 09:22:13 -07:00
Derick Rethans
22fc261628 Merge branch 'PHP-5.6' 2014-03-18 15:02:27 +00:00
Derick Rethans
415233d26d Merge branch 'PHP-5.5' into PHP-5.6 2014-03-18 15:02:25 +00:00
Derick Rethans
2dfb8fbdf4 Merge branch 'PHP-5.4' into PHP-5.5 2014-03-18 14:48:56 +00:00
Derick Rethans
b30304fb78 - Updated to version 2014.1 (2014a) 2014-03-18 14:48:55 +00:00
Andrey Hristov
dd1670067c Merge branch 'PHP-5.6' 2014-03-18 16:19:34 +02:00
Andrey Hristov
39c53031e0 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-18 15:42:57 +02:00
Andrey Hristov
2b811a5aec Add a test 2014-03-18 15:42:38 +02:00
Mateusz Kocielski
582032b659 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed wrong indentation
 2014-03-18 10:50:16 +01:00
Mateusz Kocielski
6c259625c4 Fixed wrong indentation 2014-03-18 10:49:28 +01:00
Mateusz Kocielski
1a5c51829a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix phpdbg build on FreeBSD
  Fixed off-by-one in php_url_parse_ex
 2014-03-18 10:03:06 +01:00
Mateusz Kocielski
888f467d63 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed off-by-one in php_url_parse_ex
 2014-03-18 09:53:58 +01:00
Mateusz Kocielski
ccae70b765 Fix phpdbg build on FreeBSD 
Added missing netinet/in.h header.
 2014-03-18 09:51:39 +01:00
Mateusz Kocielski
156cc39e21 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed off-by-one in php_url_parse_ex
 2014-03-18 08:57:30 +01:00
Mateusz Kocielski
497b918e62 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed off-by-one in php_url_parse_ex

Conflicts:
	ext/standard/url.c
 2014-03-18 08:54:57 +01:00
Mateusz Kocielski
46566b78c9 Fixed off-by-one in php_url_parse_ex 
Change order of condition, previously pointer could be derefrenced before
bound check was done.
 2014-03-18 08:48:41 +01:00
Yasuo Ohgaki
789b10ccb5 Merge branch 'PHP-5.6' 
* PHP-5.6:
 Modified php.ini-* description for encoding related changes
 2014-03-18 07:29:22 +09:00
Yasuo Ohgaki
a28389b2ab Fixed typo in UPGRADING and modified php.ini-* description for encoding related changes 2014-03-18 07:28:26 +09:00
Nikita Popov
2c31b9f506 Merge branch 'PHP-5.6' 2014-03-17 22:32:45 +01:00
Nikita Popov
42562ee913 Add support for PCRE marks 
If a MARK is set then it will be returned in the $matches array
unter key "MARK". If no MARK is used or passed, the key will not
be set.
 2014-03-17 22:32:40 +01:00
Yasuo Ohgaki
c4c97d878d Update UPGRADING. 
Add more descriptions about default_charset and encoding related changes.
Many thanks to Christopher.
 2014-03-18 05:49:09 +09:00
Daniel Lowrey
ddbd20bd29 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Support async pgsql connections and non-blocking queries
 2014-03-17 08:03:54 -06:00
Daniel Lowrey
33c7976dfc UPGRADING (openssl updates) 2014-03-17 08:03:40 -06:00