php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-11 10:03:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
78,283 Commits 547 Branches 1,483 Tags
4e5195f82cde3bb16cfe078d06a783ffec267c25
Commit Graph

3079 Commits

Author SHA1 Message Date
Johannes Schlüter
84efb8fc71 Merge branch 'PHP-5.6' 2014-01-18 13:53:15 +01:00
Johannes Schlüter
8ff4d61f08 Merge branch 'phpdbg' into PHP-5.6 2014-01-18 13:52:27 +01:00
Antony Dovgal
98e6c8ca2d fix indentation 2014-01-17 12:49:21 +04:00
Gernot Vormayr
dff0d51243 Add some basic and apparmor tests to fpm 2014-01-17 12:49:07 +04:00
Gernot Vormayr
e3d3283405 Add --force-stderr to fpm 2014-01-17 12:49:00 +04:00
Gernot Vormayr
f6d137a716 Add apparmor change hat functionality to fpm 2014-01-17 12:48:33 +04:00
Antony Dovgal
a053e69991 fix indentation 2014-01-17 12:22:07 +04:00
Antony Dovgal
998f506b6d Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src 
* 'fpm-apparmor-fixed' of https://github.com/notti/php-src:
  Add some basic and apparmor tests to fpm
  Add --force-stderr to fpm
  Add apparmor change hat functionality to fpm
 2014-01-16 17:36:03 +04:00
Gernot Vormayr
e9883779a0 Add some basic and apparmor tests to fpm 2014-01-07 00:21:24 +01:00
Gernot Vormayr
32d9409a24 Add --force-stderr to fpm 2014-01-07 00:19:01 +01:00
Xinchen Hui
0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
krakjoe
50f09d8256 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update version output
 2013-12-27 18:04:06 +00:00
krakjoe
c8dedaf2dc update version output 2013-12-27 18:03:11 +00:00
Xinchen Hui
fb4678f1ac Merge branch 'PHP-5.6' 2013-12-27 20:46:08 +08:00
Xinchen Hui
a8cd9b417c Fixed bug #66358 (fpm starts segfault) 2013-12-27 20:45:43 +08:00
Anatol Belski
c676f5b36d Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix c89 compat
 2013-12-25 23:44:24 +01:00
Anatol Belski
1e411ebdf5 fix c89 compat 2013-12-25 23:43:20 +01:00
Anatol Belski
3af0ee0ea3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed incompatible pointer in phpdbg on win64
 2013-12-24 21:09:45 +01:00
Anatol Belski
00c7b973bb fixed incompatible pointer in phpdbg on win64 2013-12-24 21:08:33 +01:00
Bob Weinand
c02acf3c29 Merge branch 'PHP-5.6' 2013-12-24 13:20:12 +01:00
Bob Weinand
ddf733fa69 Fixed #18 
Errors not displaying in some configurations
 2013-12-24 13:19:18 +01:00
Bob Weinand
ad358593a8 Merge branch 'PHP-5.6' 2013-12-24 00:37:20 +01:00
Bob Weinand
ca882858f4 Fixed credits in phpdbg.* files 2013-12-24 00:34:23 +01:00
Bob Weinand
0577ccad28 Added breaking upon fatal-ish error 2013-12-24 00:30:37 +01:00
Joe Watkins
617aefbcda credits file for phpdbg 2013-12-24 00:16:47 +01:00
Joe Watkins
056f6fd895 Merge branch 'PHP-5.6' 
* PHP-5.6:
  credits file for phpdbg
 2013-12-23 22:37:36 +00:00
Joe Watkins
265fdd9139 credits file for phpdbg 2013-12-23 22:36:30 +00:00
Bob Weinand
f500be8838 Merge branch 'PHP-5.6' 2013-12-20 14:35:40 +01:00
Bob Weinand
cee72c13d7 Merge branch 'master' of sapi/phpdbg into PHP-5.6 
Including phpdbg.
 2013-12-20 14:27:51 +01:00
Felipe Pena
a8a36b7d52 - Fixed build 2013-12-18 08:28:44 -02:00
Kalle Sommer Nielsen
d02340bb39 Kill a TSRMLS_FETCH() call in sapi/caudium 2013-12-18 09:11:15 +01:00
Kalle Sommer Nielsen
f883d3cc7a We might as well re-use the TSRMLS parameters here as they are available in PHP_FUNCTION anyway to save a TSRMLS_FETCH() call 2013-12-18 09:10:45 +01:00
Kalle Sommer Nielsen
ed5a8d510f Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few TSRMLS_FETCH() calls in our various SAPIs 2013-12-18 09:06:39 +01:00
Kalle Sommer Nielsen
f70f89c1b1 Kill another TSRMLS_FECH() in sapi/roxen 2013-12-18 09:05:01 +01:00
Kalle Sommer Nielsen
520d969fea Fix these SAPI hooks so that the TSRMLS parameters are correctly passed as required by the sapi struct 
# Not sure if this builds either
 2013-12-18 09:01:44 +01:00
Kalle Sommer Nielsen
432e91f112 Bump year 
# Wonder if this is even working anymore
 2013-12-18 08:55:19 +01:00
Kalle Sommer Nielsen
e6b471933c Kill yet another TSRMLS_FETCH() inside the CLI HTTP server 2013-12-18 08:17:49 +01:00
Kalle Sommer Nielsen
bd58146ad6 Kill another TSRMLS_FETCH() in the zend extension loading code 2013-12-18 07:59:47 +01:00
Kalle Sommer Nielsen
1433dec2d0 Kill another TSRMLS_FETCH() in zend_indent() 2013-12-12 22:09:38 +01:00
Kalle Sommer Nielsen
0fc8e6af0a Eliminate another straight forward TSRMLS_FETCH() in zend_startup_module() 
# For THTTPD:
# The code that uses a call to this function is for older versions of PHP anyway so its not covered

# For Zend OpCache:
# Added a new define for 5.6 and wrapped the code around that so its still compatible with older version
 2013-12-12 20:30:45 +01:00
Ard Biesheuvel
21fd125343 Merge branch 'PHP-5.6' 2013-12-09 17:04:05 +01:00
Ard Biesheuvel
f33265d572 cli: don't cast away const in select() timeout argument 
The timeout argument to select() is modified to reflect the time
remaining when the function returns on a non-timeout condition.
Passing a pointer to const data and casting away the const-ness is
asking for trouble, but for some reason, this trouble manifests
itself only on non-x86 architectures [whose implementation of select()
in glibc is different from the one supplied for x86]

Fix this by passing a stack copy of the timeout argument to select()
 2013-12-09 16:54:42 +01:00
George Wang
9960ecc5cd update to LSAPI 6.6 2013-11-26 18:53:35 -05:00
Julien Pauli
aa33da6a51 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed a wrong test
 2013-11-26 17:43:45 +01:00
Julien Pauli
ff20a9019d Fixed a wrong test 2013-11-26 17:43:31 +01:00
Andrea Faulds
35b463a2c5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
  Removed UPGRADING note
  Rewrote test using tcp instead of http:// stream
  Implemented FR #65917 (getallheaders() is not supported by the built-in...)
 2013-11-18 21:43:59 +00:00
Andrea Faulds
9937e2fda5 Merge branch 'CLIGetAllHeadersBackport' into PHP-5.5 
* CLIGetAllHeadersBackport:
  Removed UPGRADING note
  Rewrote test using tcp instead of http:// stream
  Implemented FR #65917 (getallheaders() is not supported by the built-in...)
 2013-11-18 21:19:07 +00:00
Christopher Jones
419bef3070 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  This is CLI web server change.  Added some common MIME types to the existing lookup list, pending a more thorough lookup solution, if anyone wants to do that.  Ref http://news.php.net/php.internals/69990
 2013-11-15 12:37:17 -08:00
Christopher Jones
d0cd112702 This is CLI web server change. Added some common MIME types to the 
existing lookup list, pending a more thorough lookup solution, if
anyone wants to do that.  Ref http://news.php.net/php.internals/69990

A router can be used to add to, or override, the MIME type lookups,
see http://php.net/manual/en/features.commandline.webserver.php
 2013-11-15 12:36:25 -08:00