php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-28 18:22:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,721 Commits 547 Branches 1,481 Tags
101adecbcd95eeffca5e0f73bf2a64d513de764d
Commit Graph

3367 Commits

Author SHA1 Message Date
Anatol Belski
69d6e093e9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed the cast and incompatible pointer warning

Conflicts:
	sapi/cgi/fastcgi.c
 2014-09-12 14:37:54 +02:00
Anatol Belski
bcdbd47117 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed the cast and incompatible pointer warning
 2014-09-12 14:36:54 +02:00
Anatol Belski
fdfc31a4f7 fixed the cast and incompatible pointer warning 2014-09-12 14:36:00 +02:00
Dmitry Stogov
82096dc151 Removed ZEND_QM_ASSIGN_VAR and ZEND_JMP_SET_VAR opcodes (in PHPNG they did exacly the same as ZEND_QM_ASSIGN and ZEND_JMP_SET) 2014-09-11 12:29:54 +04:00
Dmitry Stogov
1981dd9c73 Revert "Removing ext/ereg and dependencies" 
This reverts commit 86de7963fe.
 2014-09-11 11:06:57 +04:00
Tjerk Meesters
86de7963fe Removing ext/ereg and dependencies 
Affected extensions:
- opcache (use pcre)
- mbstring (removed ereg functions overloading)
- pgsql (use pcre)
- reflection (test cases using 'ereg')

SAPI:
- apache (header only)
- apache_hooks (header only)
 2014-09-11 10:22:44 +08:00
George Wang
2470e01ab6 Fine tuned the order of adding request variables. 2014-09-09 00:01:36 -04:00
George Wang
4bdd9aabdd Fine tuned the order of adding request variables. 2014-09-09 00:01:03 -04:00
George Wang
bdac08bcdd Fine tuned the order of adding request variables. 2014-09-09 00:00:14 -04:00
Dmitry Stogov
6561d03a41 Added ability to make a number of "warmup" requests before an actual benchmark. 
(php-cgi -T [<number-of-warmup-requests>,]<number-of-benchmark-requests> <file>)
 2014-09-08 16:24:46 +04:00
Nikita Popov
00805ffb92 Merge branch 'PHP-5.6' 
Conflicts:
	ext/soap/php_http.c
 2014-09-04 21:23:11 +02:00
George Wang
b85b78db4f Update LSAPI to 6.7, added support for 'filter_input'. 
Fixed a crash in CLI mode.
 2014-09-03 11:29:44 -04:00
George Wang
b16929ca72 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2014-09-03 11:28:30 -04:00
George Wang
bba16dde5d Update LSAPI to 6.7, added support for 'filter_input'. 
Fixed a crash in CLI mode.
 2014-09-03 11:27:54 -04:00
Dmitry Stogov
e51677b2e6 fixed reference counting 2014-09-02 11:24:52 +04:00
Stanislav Malyshev
d18803eb5f fix apache handler build 2014-09-01 14:49:52 -07:00
Dmitry Stogov
88d7ca44f6 Refactored INI subsystem to use zend_string* instead of char* 2014-09-01 20:57:33 +04:00
Christopher Jones
88099a0a27 Allow PHP 7 to install in Apache 2 on OS X 
This fixes the fundamental part of #67910.  The complete change from
php5 -> php7 in sapi/* still needs to be done.
 2014-08-29 08:47:10 -07:00
Stanislav Malyshev
e55c641792 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix NEWS for fcgi fix merge
  restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
 2014-08-28 23:11:55 -07:00
David Zuelke
ee275e34c8 restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606 2014-08-28 23:06:00 -07:00
Xinchen Hui
4a12b4cef9 closesocket is defined in php_network.h 2014-08-28 13:20:43 +08:00
Xinchen Hui
7a90e40af7 closesocket is already defined in main/php_network.h 2014-08-28 13:18:55 +08:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski
202e8db1dc fixed several long vs zend_long casts 2014-08-26 11:26:53 +02:00
Xinchen Hui
df7b6779bc Fixed incompatible pointer type (int64) 2014-08-26 12:11:28 +08:00
Nikita Popov
59848e3fbb Remove ZEND_ACC_INTERACTIVE and CG(interactive) 
As far as I can discern these are leftovers of the interactive
shell implementation that was used before PHP 5.4. Now the readline
ext makes use of normal eval calls for this.

So, dropping these until there is evidence to the contrary, as they
currently wouldn't work anyway.
 2014-08-25 23:46:43 +02:00
Anatol Belski
455741fce3 master renames phase 4 2014-08-25 20:57:25 +02:00
Anatol Belski
4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Anatol Belski
6f9f0bf205 master renames phase 2 2014-08-25 19:28:33 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
8d6ef99a39 Merge remote-tracking branch 'php/master' 2014-08-21 09:21:31 +02:00
Remi Collet
e02616866f Fix bug #67878 program_prefix not honoured in man pages 
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
 2014-08-21 09:14:38 +02:00
Remi Collet
e9166fec62 Fix bug #67878 program_prefix not honoured in man pages 
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
 2014-08-21 09:14:16 +02:00
Remi Collet
dde4d2e628 Fix bug #67878 program_prefix not honoured in man pages 
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
 2014-08-21 09:13:12 +02:00
Anatol Belski
fdbbe5fa30 fixed some incompatible types 2014-08-20 09:52:23 +02:00
Anatol Belski
07359785c3 Merge remote-tracking branch 'php/master' 2014-08-20 08:48:43 +02:00
Tjerk Meesters
285934a4c9 Fixed off-by-one memory allocation that could lead to invalid memory reads on strlen() 
Always properly null terminate strings before ini parsing
Remove unnecessary memset() statements
 2014-08-20 12:13:19 +08:00
Andrea Faulds
376e545b01 Merge branch 'fpmConfFix' of github.com:DaveRandom/php-src 2014-08-20 00:28:43 +01:00
Anatol Belski
61c8af6a9d ported apache handler 2014-08-19 23:39:22 +02:00
Anatol Belski
21f623e945 ported fcgi 2014-08-19 23:12:17 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Anatol Belski
77eb6e7278 Merge branch 'master' of git.php.net:php-src 
# By Veres Lajos (2) and Lior Kaplan (1)
# Via Lior Kaplan
* 'master' of git.php.net:php-src:
  Correct typo in comments: 'initialized'
  typofixes
  typofixes
 2014-08-17 21:40:39 +02:00
Anatol Belski
41115d3d9d regenerated parser files 2014-08-17 21:05:20 +02:00
Veres Lajos
1e3452992f typofixes 2014-08-17 16:00:39 +03:00
Anatol Belski
54906c760f increase the stack size for cli and cgi 2014-08-16 16:45:05 +02:00
Anatol Belski
cb25136f4e fix macros in the 5 basic extensions 2014-08-16 11:37:14 +02:00
Dmitry Stogov
7497c8793d Merge branch 'master' into phpng 
* master: (51 commits)
  Update Git rules
  Back to -dev (with EOL notice in NEWS)
  new NEWS block for the next release
  It's 2014 already, fix copyright year where user visible
  PHP 5.3.29
  Some changes were lost in the merge commit of #66091
  Updated NEWS for #66091
  Fixed #66091
  Updated NEWS for #66091
  Updated NEWS for #66091
  Fixed #66091
  updated NEWS
  updated NEWS
  updated NEWS
  backported the fix for bug #41577
  NEWS entry for e6d93a1 / d73d44c
  restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
  Revert "Merge branch 'pull-request/694' into PHP-5.6"
  PHP 5.3.29RC1
  Fix missing type checks in various functions
  ...

Conflicts:
	ext/date/php_date.c
	ext/standard/math.c
 2014-08-14 23:30:49 +04:00
Dmitry Stogov
a08b7b7701 cleanup 2014-08-13 19:43:34 +04:00
Dmitry Stogov
c1c913c5f1 cleanup (we don't have to duplicate elements of module_registry) 2014-08-13 17:05:18 +04:00
Dmitry Stogov
5a06ac88da cleanup (use zend_string* instead of char*) 2014-08-13 14:51:48 +04:00