clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,665 Commits 494 Branches 1,367 Tags 801 MiB
59dcf9879b
Commit Graph

78665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
59dcf9879b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  more fixes related to bug #65715
 2014-03-24 19:19:06 +01:00
Anatol Belski
223f7d9a44 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  more fixes related to bug #65715
 2014-03-24 19:18:39 +01:00
Anatol Belski
6612e1ba6a more fixes related to bug #65715 2014-03-24 19:15:02 +01:00
Michael Wallner
caba0203e8 fix some warnings 2014-03-24 17:51:50 +01:00
Michael Wallner
275b2c420d PHP-5.6 compatibility for apache2 filter SAPI 2014-03-24 17:48:28 +01:00
Anatol Belski
26f7051cf4 updated NEWS 2014-03-24 10:31:08 +01:00
Anatol Belski
13e8486550 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore
 2014-03-24 10:30:05 +01:00
Anatol Belski
8558640a6a updated NEWS 2014-03-24 10:29:39 +01:00
Anatol Belski
76066b304c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore
 2014-03-24 10:28:48 +01:00
Anatol Belski
5efda763be updated NEWS 2014-03-24 10:28:21 +01:00
Anatol Belski
17a57ad980 Fixed bug #65715 php5embed.lib isn't provided anymore 2014-03-24 10:24:37 +01:00
Anatol Belski
9d4001f1c8 fix C89 compat 2014-03-22 10:44:01 +01:00
Andrey Hristov
61103cc25c Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-03-21 14:33:44 +02:00
Nikita Popov
f331ed1414 Revert "Add helper function for updating bucket contents" 
Reverting this for now, because it would require further changes
thanks to the zend signals tsrms-but-only-sometimes awesomeness.
 2014-03-21 01:32:49 +01:00
Nikita Popov
4e7e301dda Rename+move zend_hash_apply_deleter and reuse it 
The interruption handling was normalized to wrap the entire deletion
operation (instead of leaving out the destructor call and/or the
deallocation) per the recommendation of somebody (don't remember who)
familiar with zend signals.

There is an always-inlined variant of the function for use in
the main deletion function, to ensure there is no performance
impact.
 2014-03-21 00:14:52 +01:00
Nikita Popov
4efa58dd59 Make zend_hash_apply_deleter() void, to allow reuse 
Also remove lies in the comment above the function. apply_deleter
is not safe against modification, if the modification involves
removing the next bucket.

Also modified the implementation of zend_hash_graceful_destroy()
to be fully graceful (the reverse variant already was).
 2014-03-21 00:14:51 +01:00
Nikita Popov
c3a317117a Add helper function for updating bucket contents 2014-03-21 00:14:46 +01:00
Nikita Popov
994fcfcff9 Remove unnecessary check 
In case of an update the key already existed, so the next free
element can not change.
 2014-03-20 22:58:10 +01:00
Andrey Hristov
113f22550a Fixes after merge 2014-03-20 17:28:49 +02:00
Andrey Hristov
d2ab74588e Merge branch 'PHP-5.5' into PHP-5.6 2014-03-20 16:30:01 +02:00
Andrey Hristov
41b4b84dda Emit a warning in case of unallowed characters. Fix another place this 
code is used - reuse
 2014-03-20 16:23:40 +02:00
Remi Collet
7f7c84d64f add info: empty strings are interned 2014-03-20 15:18:41 +01:00
Andrey Hristov
e52334fdbe Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/mysqli/mysqli_api.c
 2014-03-20 16:16:12 +02:00
Andrey Hristov
059bc99d94 don't replace with ?, just skip it 2014-03-20 12:11:16 +02:00
Yasuo Ohgaki
e1fe76f28a Add default_charset handling 2014-03-20 10:50:32 +09:00
Tjerk Meesters
d0e3173016 Updated UPGRADING to add three changes 2014-03-20 07:44:23 +08: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
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
62ab3af12f fix compilation error 2014-03-19 19:15:04 +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
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
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
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
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
a6f7fca637 Merge accepted RFC https://wiki.php.net/rfc/timing_attack into 5.6. 2014-03-18 09:22:13 -07: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
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
6c259625c4 Fixed wrong indentation 2014-03-18 10:49:28 +01:00