archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
88979 commits 526 branches 1434 tags 883 MiB
Commit graph

88979 commits

This branch
This branch
All branches
Author SHA1 Message Date
Felipe Pena
35a68c276d - Fix merge 2015-02-16 13:09:40 -02:00
Felipe Pena
e08bef442c - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de 2015-02-16 13:07:26 -02:00
Felipe Pena
812c0c0337 - Fix merge 2015-02-16 12:48:05 -02:00
Felipe Pena
d259a853f4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  BFN
  Update NEWS
 2015-02-16 12:47:30 -02:00
Felipe Pena
83f85a4ab3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
 2015-02-16 12:47:16 -02:00
Felipe Pena
650098868c - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de 2015-02-16 12:46:43 -02:00
Felipe Pena
2e913a5251 Merge branch 'master' of git.php.net:/php-src 2015-02-16 12:22:17 -02:00
Felipe Pena
a80ad10d9b - Fix merge 2015-02-16 12:21:20 -02:00
Felipe Pena
02de601ff8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  BFN
  Update NEWS
 2015-02-16 12:08:39 -02:00
Felipe Pena
76a505f09b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
 2015-02-16 12:08:26 -02:00
Felipe Pena
40c60b8212 - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de 2015-02-16 12:08:07 -02:00
Antony Dovgal
8d157b67fe Merge branch 'pull-request/995' 
* pull-request/995:
  fix bug #68822 (request time is reset too early)
 2015-02-16 15:27:54 +03:00
Antony Dovgal
dbf7d525a5 BFN 2015-02-16 15:23:13 +03:00
Antony Dovgal
1d94cd4bfa Merge branch 'pull-request/995' into PHP-5.5 
* pull-request/995:
  fix bug #68822 (request time is reset too early)
 2015-02-16 15:20:39 +03:00
Antony Dovgal
c4664d1731 Merge branch 'pull-request/995' into PHP-5.6 
* pull-request/995:
  fix bug #68822 (request time is reset too early)
 2015-02-16 15:15:11 +03:00
redfoxli
3664345aba fix bug #68822 (request time is reset too early) 
this caused wrong time in the logs
 2015-02-16 15:10:09 +03:00
Xinchen Hui
9973df7b4f Merge branch 'master' of https://git.php.net/repository/php-src 2015-02-16 14:22:56 +08:00
Xinchen Hui
10fe317300 Merge branch 'PHP-5.6' 
Conflicts:
	ext/openssl/openssl.c
 2015-02-16 14:18:08 +08:00
Xinchen Hui
8309988111 Fixed bug #68912 (Segmentation fault at openssl_spki_new) 2015-02-16 14:16:52 +08:00
Jakub Zelenka
5f82c9256d Update JSON Readme 2015-02-15 20:04:16 +00:00
Jakub Zelenka
549c6fa465 Remove unused destructor in json parser 2015-02-15 19:46:41 +00:00
Jakub Zelenka
911f7b10b1 Add bison 3.0.4 genereted files for json parser 
The definitions file (json_parser.tab.h) contains file
system dependent name for C preprocessor guard:

YY_PHP_JSON_YY_HOME_JAKUB_PROG_PHP_MASTER_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED

This is because the srcdir is used for default definitions name.
It's a correct default (--definition=$(srcdir)/json_parser.tab.h)
because the build would fail otherwise. Unfortunately Bison does not have
a special option for defining cpp guard name. The only way would be
using skeleton file but that's not possible with the current
configuration as it requires using a specific bison version
(disallowing range of supported versions).
 2015-02-15 19:28:37 +00:00
Jakub Zelenka
09d27da1ba Regenerate json scanner with re2c 0.13.7.5 2015-02-15 18:08:58 +00:00
Xinchen Hui
91859f15a8 Merge branch 'PHP-5.6' 2015-02-15 23:00:41 +08:00
Xinchen Hui
423a057023 Update NEWs 2015-02-15 23:00:34 +08:00
Xinchen Hui
fc087ed1ee Merge branch 'PHP-5.6' 
Conflicts:
	ext/readline/readline.c
 2015-02-15 22:56:56 +08:00
Xinchen Hui
edd16831b1 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-15 22:55:42 +08:00
Xinchen Hui
a620b79040 Fixed bug #69054 (Null dereference in readline_(read|write)_history() without parameters) 2015-02-15 22:54:05 +08:00
Michael Wallner
b046733243 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix detection of mbstate_t with clang
 2015-02-15 09:31:47 +01:00
Michael Wallner
4137956d0e fix detection of mbstate_t with clang 
AC_TRY_COMPILE expexts a function body
 2015-02-15 09:25:03 +01:00
Xinchen Hui
e017f35b7f Merge branch 'PHP-5.6' 
Conflicts:
	ext/pgsql/pgsql.c
 2015-02-14 22:20:33 +08:00
Xinchen Hui
1db720cd6d Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/pgsql/pgsql.c
 2015-02-14 22:18:13 +08:00
Xinchen Hui
7667f8efc6 Fixed bug #68638 (pg_update() fails to store infinite values) 2015-02-14 22:17:01 +08:00
Xinchen Hui
40a94597ae Merge branch 'PHP-5.4' of https://github.com/wfelipew/php-src into PHP-5.5 2015-02-14 22:03:53 +08:00
Xinchen Hui
b73fa1fa8f Fixed build on windows 2015-02-14 12:57:53 +08:00
Nikita Popov
9d1e36e4b6 Some more UPGRADING changes 2015-02-13 21:44:22 +01:00
Yasuo Ohgaki
c0dd221a3a Update NEWS 2015-02-14 05:41:04 +09:00
Yasuo Ohgaki
d0be36cf5b Update NEWS 2015-02-14 05:40:51 +09:00
Yasuo Ohgaki
7d0e3c01e6 Added NULL byte protection to exec, system and passthru. 2015-02-14 05:37:56 +09:00
Yasuo Ohgaki
5b6269a253 Update NEWS 2015-02-14 05:34:57 +09:00
Yasuo Ohgaki
096fb06dab Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add NULL byte protection to exec, system and passthru
 2015-02-14 05:28:32 +09:00
Yasuo Ohgaki
a54300b3f6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add NULL byte protection to exec, system and passthru
 2015-02-14 05:27:44 +09:00
Yasuo Ohgaki
3ea76a768c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add NULL byte protection to exec, system and passthru
 2015-02-14 05:26:54 +09:00
Yasuo Ohgaki
a8722f5330 Add NULL byte protection to exec, system and passthru 2015-02-14 05:25:04 +09:00
Nikita Popov
bfeae649f6 More extensive UPGRADING 
I'd like UPGRADING to have a complete list of changes including
code samples and suggested changes. Right now it's only a list
of bullet points, where it is often required to read a linked
RFC to understand the difference.
 2015-02-13 20:52:55 +01:00
Dmitry Stogov
e10e151e9b Merged zend_array and HashTable into the single data structure. 
Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write
zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.
 2015-02-13 22:20:39 +03:00
Dmitry Stogov
bc630ad6da Get rid of old HashTable iteration API (it doesn't work with constant arrays) 2015-02-13 20:18:29 +03:00
Popa Adrian Marius
8f968c5416 Apply PHP7 firebird fixes after API Cleanup from 8c920a22ac 2015-02-13 17:55:17 +02:00
Nikita Popov
03ded8c7ea Remove unused variable 2015-02-13 15:33:50 +01:00
Guilherme Blanco
4498d34aea Check interface/trait extension for internal classes 
Removed possibility to have extensions to declare classes extending
interfaces or traits. It was checked in user classes, not extensions
or internal.
 2015-02-13 15:31:48 +01:00