clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
84,703 Commits 491 Branches 1,363 Tags 844 MiB
2c66a8c53e
Commit Graph

84703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
a7666a6041 Fix ZTS build 2014-09-01 15:41:00 -07:00
Tjerk Meesters
f54451cf39 Make DOMNode::textContent writeable 2014-09-02 06:34:18 +08:00
Tjerk Meesters
8da58e36b4 Updated UPGRADING 2014-09-02 06:32:56 +08:00
Tjerk Meesters
83bacd2fe0 Updated NEWS 2014-09-02 06:32:56 +08:00
Stanislav Malyshev
d18803eb5f fix apache handler build 2014-09-01 14:49:52 -07:00
Stanislav Malyshev
1ff1a0dde2 Revert "Merge branch 'PHP-5.6'" 
This reverts commit aaf5689f4d, reversing
changes made to 481bf25b6a.
 2014-09-01 14:35:04 -07:00
Stanislav Malyshev
aaf5689f4d Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
  Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)
  Fix typo from commit 32314f6b6
  Fix destruction order in zend_shutdown (bug #65463, #66036)

Conflicts:
	Zend/zend_compile.h
	Zend/zend_execute_API.c
 2014-09-01 12:22:41 -07:00
Stanislav Malyshev
57f82819e9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)
  Fix typo from commit 32314f6b6
  Fix destruction order in zend_shutdown (bug #65463, #66036)
 2014-09-01 12:20:34 -07:00
Stanislav Malyshev
4b9fcc01d4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
  Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)
  Fix typo from commit 32314f6b6
  Fix destruction order in zend_shutdown (bug #65463, #66036)
 2014-09-01 12:15:54 -07:00
Stanislav Malyshev
30aceaf1a7 update NEWS 2014-09-01 12:13:43 -07:00
Stanislav Malyshev
197095c29e Merge branch 'pull-request/770' into PHP-5.4 
* pull-request/770:
  Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)
  Fix typo from commit 32314f6b6
  Fix destruction order in zend_shutdown (bug #65463, #66036)
 2014-09-01 12:11:42 -07:00
Anatol Belski
481bf25b6a restore the length var and fix the com_dotnet ini 2014-09-01 20:34:33 +02:00
Dmitry Stogov
88d7ca44f6 Refactored INI subsystem to use zend_string* instead of char* 2014-09-01 20:57:33 +04:00
Derick Rethans
b9f3247267 Merge branch 'PHP-5.6' 2014-09-01 16:40:57 +01:00
Derick Rethans
f89b7ec389 Merge branch 'PHP-5.5' into PHP-5.6 2014-09-01 16:40:54 +01:00
Derick Rethans
21446cd7b6 Merge branch 'PHP-5.4' into PHP-5.5 2014-09-01 16:40:50 +01:00
Derick Rethans
e665a07ab9 - Updated to version 2014.7 (2014g) 2014-09-01 16:40:49 +01:00
Tjerk Meesters
8064b1f4f7 Fixed 'long' -> 'zend_long' for call to 'is_numeric_string_ex()' 2014-09-01 22:49:12 +08:00
Tjerk Meesters
01760184a9 Updated UPGRADING for #38409 2014-09-01 22:43:35 +08:00
Tjerk Meesters
099dfdf873 Updated NEWS for #38409 2014-09-01 22:43:34 +08:00
Tjerk Meesters
5d5a7b1f7f Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated UPGRADING for #38409
  Updated NEWS for #38409
  Added test case
  Making ini parser typed - Added ZEND_INI_SCANNER_TYPED mode for parse_ini_string() and parse_ini_file() - Added NULL_NULL token to separate it from BOOL_FALSE and BOOL_TRUE - Added zend_ini_copy_typed_value() function for zval initialisation - Updated RETURN_TOKEN() to observe scanner_mode

Conflicts:
	Zend/zend_ini_parser.y
	Zend/zend_ini_scanner.c
 2014-09-01 22:43:17 +08:00
Tjerk Meesters
f0ba3e265a Updated UPGRADING for #38409 2014-09-01 22:15:53 +08:00
Tjerk Meesters
65c1e14cb9 Updated NEWS for #38409 2014-09-01 22:13:38 +08:00
Tjerk Meesters
1bf996b324 Added test case 2014-09-01 22:04:25 +08:00
Tjerk Meesters
5270ee1aef Making ini parser typed 
- Added ZEND_INI_SCANNER_TYPED mode for parse_ini_string() and parse_ini_file()
- Added NULL_NULL token to separate it from BOOL_FALSE and BOOL_TRUE
- Added zend_ini_copy_typed_value() function for zval initialisation
- Updated RETURN_TOKEN() to observe scanner_mode
 2014-09-01 22:04:06 +08:00
Anatol Belski
bc7833ddd2 switch to built-in atanh() on vs2013 and up 2014-09-01 15:45:55 +02:00
Anatol Belski
f4ed876db1 fix acosh for vs2012 and earlier 2014-09-01 15:34:42 +02:00
Anatol Belski
3aa5583cab fix asinh() on win64 for big negative values 2014-09-01 15:34:40 +02:00
Anatol Belski
8a7d434025 fix acosh and asinh on win64 with vs2013+ 2014-09-01 14:21:53 +02:00
Anatol Belski
d4a05d1990 fix C89 compat 2014-08-31 21:58:05 +02:00
Nuno Lopes
25f5ba94ac remove a few gcc format attributes from some printf-like functions 
Since now PHP's printf-like functions have many custom specifiers, the amount of false-positives wasnt worth it
 2014-08-31 11:45:11 -04:00
Nuno Lopes
51ce4bd87c add a few more patterns to .gitignore 2014-08-31 15:19:14 +01:00
Anatol Belski
a3f82ae0ee fix expected warning in test 2014-08-31 14:02:31 +02:00
Anatol Belski
b89d7ae5ba fix dir separators in test 2014-08-31 14:02:30 +02:00
Anatol Belski
312181bc13 fix iptcembed() 2014-08-31 14:02:28 +02:00
Nikita Popov
c59292570c Merge branch 'PHP-5.6' 
Conflicts:
	Zend/zend_compile.c
 2014-08-30 20:45:10 +02:00
Nikita Popov
d7368c2531 Fix bug #67938: Segfault when extending interface method with variadic 
We only want to check extra optional args if the proto function is
variadic, not when we're adding extra variadic args.
 2014-08-30 20:43:34 +02:00
Anatol Belski
3aea1dca06 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
 2014-08-30 04:06:25 +02:00
Anatol Belski
daefca44b5 updated NEWS 2014-08-30 04:06:00 +02:00
Anatol Belski
f4ebeead5d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #67731 finfo::file() returns invalid mime type for binary files
 2014-08-30 04:05:42 +02:00
Anatol Belski
c301467f9b Fixed bug #67731 finfo::file() returns invalid mime type for binary files 2014-08-30 04:04:42 +02:00
Johannes Schlüter
ca042bb18c Use global symbol table for completion after $ in readline. 2014-08-30 00:02:31 +02:00
Nikita Popov
f1c2017851 Don't depend on exact parse error messages in assert tests 2014-08-29 22:07:25 +02:00
Nikita Popov
b73bea9cc8 Combine foreach copy / switch cond stacks 
Now one common stack to handle both, which stores znodes instead of
full oplines (foreach copy stack) or switch entries (switch cond
stack).

Also removed EG(start_op) while at it.
 2014-08-29 21:53:09 +02:00
Nikita Popov
545fd5168e Don't distinguish between ast/list in parser 
This removes the need to use $<ast>{n} or $<list>$ casts in the
reduction actions.

Keeping the distinction in the parser doesn't really give us any
benefit and only makes changing the grammar harder.
 2014-08-29 21:02:10 +02:00
Nikita Popov
25d57aace3 Introduce optional_expr 2014-08-29 18:51:58 +02:00
Nikita Popov
c6a5c3c6c5 Remove parenthesis_expr 
This was necessary previously to handle yields, now it only clutters
up the grammar.
 2014-08-29 18:46:46 +02:00
Nikita Popov
7722d2c584 Simplify argument production 2014-08-29 18:42:05 +02:00
Christopher Jones
e39cc57bbd Merge branch 'PHP-5.6' 
* PHP-5.6:
  Remove 550+ compile warnings on OS X
 2014-08-29 08:48:56 -07:00
Christopher Jones
6fe0bdda9c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Remove 550+ compile warnings on OS X
 2014-08-29 08:48:43 -07:00