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
88,953 Commits 494 Branches 1,367 Tags 801 MiB
aee2985f35
Commit Graph

88953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
206481cd01 create php prefix before copying dlls 2015-03-12 15:25:43 +01:00
Anatol Belski
8cc8d4830a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  create the php prefix if doesn't exist
 2015-03-12 15:21:33 +01:00
Anatol Belski
6b643f0741 create the php prefix if doesn't exist 2015-03-12 15:20:53 +01:00
Dmitry Stogov
9d71d65388 Fixed tests 2015-03-12 16:58:50 +03:00
Dmitry Stogov
8633685675 Use specialized macro for string zval creation 2015-03-12 16:53:51 +03:00
Anatol Belski
0e30c543ec upgrade to oniguruman 5.9.6 2015-03-12 13:42:36 +01:00
Anatol Belski
ff337bf52b expose oniguruma version 2015-03-12 13:28:43 +01:00
Anatol Belski
11716401bd fix possible unititialized pointer usage 2015-03-12 13:00:36 +01:00
Anatol Belski
1923c7a9b8 simplify condition 2015-03-12 10:21:43 +01:00
Anatol Belski
53b7258797 force ext/ftp to be always shared on Windows 2015-03-12 00:36:22 +01:00
Anatol Belski
2f443acad1 remove ext/openssl dependency for ext/ftp from conf 2015-03-12 00:13:01 +01:00
Anatol Belski
d2ee0840d2 don't depend on ext/openssl for ftp ssl support 
instead just link against the openssl and init manually, that's
more flexible
 2015-03-11 23:58:59 +01:00
Anatol Belski
4ee0395a4a init mbstring tsrm_ls_cache on MINIT 
as some globals are accessed there already
 2015-03-11 23:42:39 +01:00
Anatol Belski
6c5d7c29f7 properly deinit mail socket 2015-03-11 21:46:42 +01:00
Anatol Belski
cf4c60b372 use proper value to check the log_source handle 2015-03-11 21:46:41 +01:00
Anatol Belski
d5f2b4b398 fix ftp_login with ssl enabled 2015-03-11 21:46:40 +01:00
Anatol Belski
f1a47988b0 added comment 2015-03-11 21:46:39 +01:00
Anatol Belski
167979fe76 enable ftps for shared ext/ftp 2015-03-11 21:46:38 +01:00
Anatol Belski
f43cc2a19a use portable fseek 2015-03-11 21:46:37 +01:00
Daniel Lowrey
589374d027 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Don't block on crypto data inside stream_select()
 2015-03-11 09:45:28 -06:00
Daniel Lowrey
c661121459 Don't block on crypto data inside stream_select() 2015-03-11 09:44:07 -06:00
Nikita Popov
c532376ee7 Fix some memory leaks in WebPhar 2015-03-11 15:27:42 +01:00
Dmitry Stogov
d68861eb4b Improved php_json_escape_string() 2015-03-11 15:03:07 +03:00
Dmitry Stogov
781d1c400c Improved table search 2015-03-11 15:02:47 +03:00
Xinchen Hui
80274290b7 Comment out for now 2015-03-11 16:54:51 +08:00
Xinchen Hui
70f4854028 Merge branch 'master' of https://git.php.net/repository/php-src 2015-03-11 16:31:34 +08:00
Nikita Popov
de4e7e43c5 Fix memory leak 2015-03-11 09:23:29 +01:00
Xinchen Hui
37901aa467 Fixed memleak 2015-03-11 13:42:39 +08:00
Xinchen Hui
75c0f63739 Fixed memory leak 2015-03-11 10:33:43 +08:00
Xinchen Hui
253420190b Merge branch 'PHP-5.6' 2015-03-11 08:20:19 +08:00
Xinchen Hui
d4f727d0f8 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-11 08:20:03 +08:00
Xinchen Hui
675606f1a6 Improve test script for #69212 2015-03-11 08:19:34 +08:00
Daniel Lowrey
4a336f5d0b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug# 69215 (Crypto servers should send client CA list)

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-10 18:18:19 -06:00
Daniel Lowrey
3f6b12795c Fix bug# 69215 (Crypto servers should send client CA list) 2015-03-10 18:13:10 -06:00
Dmitry Stogov
026b0adc50 Fixed memory leaks 2015-03-11 01:28:13 +03:00
Dmitry Stogov
48deb1cd94 Free memory if destructor wasn't called 2015-03-11 00:57:28 +03:00
Dmitry Stogov
816b196973 Fixed memory leak 2015-03-10 23:16:09 +03:00
Dmitry Stogov
ed9c8a23ba More accurate reference counting on closures 2015-03-10 23:04:41 +03:00
Nikita Popov
00985a975d Merge branch 'PHP-5.6' 
Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
 2015-03-10 18:26:09 +01:00
Nikita Popov
49bd45a2c1 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-10 18:19:27 +01:00
Nikita Popov
bc9f2fb8df Fixed bug #69212 2015-03-10 18:17:56 +01:00
Dmitry Stogov
5d0bacfe67 Merge branch 'PHP-5.6' 
* PHP-5.6:
  We don't cache custom strems with callbacks anymore

Conflicts:
	ext/opcache/ZendAccelerator.c
 2015-03-10 19:32:38 +03:00
Dmitry Stogov
b52a2940af Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  We don't cache custom strems with callbacks anymore
 2015-03-10 19:30:32 +03:00
Dmitry Stogov
c814b3294a We don't cache custom strems with callbacks anymore 2015-03-10 19:25:30 +03:00
Dmitry Stogov
a53d82daa6 Prevent possible double inheritance (ext/opcache/tests/bug67215.phpt) 2015-03-10 18:50:07 +03:00
Anatol Belski
61406a527f C89 compat 2015-03-10 12:11:52 +01:00
Dmitry Stogov
fad8fe94a8 Fixed access on uninitialized data in Zend/tests/closure_019.phpt 2015-03-10 14:05:14 +03:00
Xinchen Hui
4f51f40bf1 Merge branch 'master' of https://git.php.net/repository/php-src 2015-03-10 17:26:15 +08:00
Xinchen Hui
0714e027d0 Merge branch 'PHP-5.6' 2015-03-10 17:24:29 +08:00
Anatol Belski
fd0a66528e correct tests as the issue is only reproduceable with cgi/fpm 2015-03-10 10:21:22 +01:00